Bug 41624 - commit queue generates wrong changelogs
Summary: commit queue generates wrong changelogs
Status: UNCONFIRMED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-05 10:05 PDT by Patrick R. Gansterer
Modified: 2022-12-06 14:21 PST (History)
7 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Patrick R. Gansterer 2010-07-05 10:05:25 PDT
see http://trac.webkit.org/changeset/62467
The Changelog and svn log message are wrong.
Comment 1 Adam Barth 2010-07-17 22:34:48 PDT
I'm really confused.  Can you show me the attachment in bugzilla that caused the problem?
Comment 2 Patrick R. Gansterer 2010-07-19 06:09:40 PDT
(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  <paroga@paroga.com>

        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  <paroga@paroga.com>

        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  <morrita@google.com>

        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.
Comment 3 Adam Barth 2010-07-19 10:04:48 PDT
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.
Comment 4 Patrick R. Gansterer 2010-09-18 13:57:40 PDT
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.
Comment 5 Eric Seidel (no email) 2010-09-18 14:17:32 PDT
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.
Comment 6 Ahmad Saleem 2022-12-06 14:21:15 PST
Is this still an issue or we can mark this as "RESOLVED WONTFIX"? Thanks!