Bug 41624 – commit queue generates wrong changelogs

• Status: UNCONFIRMED
• Component: Tools / Tests

[Patrick R. Gansterer]

see http://trac.webkit.org/changeset/62467
The Changelog and svn log message are wrong.

[Adam Barth]

I'm really confused.  Can you show me the attachment in bugzilla that caused the problem?

[Patrick R. Gansterer]

(In reply to comment #1)
> I'm really confused.  Can you show me the attachment in bugzilla that caused the problem?
The current ChangeLog looks like this:
2010-07-01  Patrick Gansterer  <[e-mail]>

        Reviewed by Nikolas Zimmermann.

        Buildfix for !ENABLE(SVG_FOREIGN_OBJECT) after r62196.
        https://bugs.webkit.org/show_bug.cgi?id=40984

        * rendering/SVGRenderSupport.cpp:
        (WebCore::SVGRenderSupport::finishRenderSVGContent):

2010-07-04  Patrick Gansterer  <[e-mail]>

        Reviewed by Dirk Schulze.

        Buildfix for !ENABLE(FILTERS) after r62238.
        https://bugs.webkit.org/show_bug.cgi?id=41456

        * rendering/SVGRenderSupport.cpp:
        (WebCore::SVGRenderSupport::prepareToRenderSVGContent):

2010-07-01  MORITA Hajime  <[e-mail]>

        Unreviewed build fix.

        * rendering/RenderInputSpeech.cpp:
        (WebCore::RenderInputSpeech::paintInputFieldSpeechButton):
        * rendering/RenderInputSpeech.h:
        * rendering/RenderTheme.cpp:
        (WebCore::RenderTheme::paintInputFieldSpeechButton):
        * rendering/RenderTheme.h:

The date is not correct.
If you compare the SVN-Log messages from http://trac.webkit.org/changeset/62467 and http://trac.webkit.org/changeset/62466 you can see that they are the same.

I think that the problem happens when the ChangeLog doesn't "apply to the first line". The diff from the ChangeLog file in https://bugs.webkit.org/attachment.cgi?id=60228&action=review starts in line 3 instead of 1.

[Adam Barth]

Yes, I understand that.  To debug the issue, I'll need to see the patch file that caused the problem.  Ideally, I'd look at the bugs.webkit.org attachment number so I can see the timing information too.

[Patrick R. Gansterer]

Maybe this is be a bug in webkit-patch land!
I used webkit-patch land to commit http://trac.webkit.org/changeset/67788, but it landed with the wrong svn log message :-(
I used it with a svn checkout on linux.

[Eric Seidel (no email)]

It's an interaction between git and webkit-patch land.  The commit-queue doesn't hit it anymore.  But if you ever git svn rebase, git may merge your ChangeLogs wrong.

There is a ChangeLog conflict merge tool (see http://trac.webkit.org/wiki/UsingGitWithWebKit) which can help.  I don't think it would fully solve your issue.

The fix is we need to make webkit-patch land double-check the ChangeLog diff before landing.  If it's not at the top of the file, it needs to abort.

[Ahmad Saleem]

Is this still an issue or we can mark this as "RESOLVED WONTFIX"? Thanks!