[Webkit-unassigned] [Bug 41624] commit queue generates wrong changelogs

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=41624





--- Comment #5 from Eric Seidel <eric at webkit.org>  2010-09-18 14:17:32 PST ---
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.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.