RESOLVED DUPLICATE of bug 30683 Bug 26865
bugzilla-tool needs to know how to re-order ChangeLogs which git merges wrong 
https://bugs.webkit.org/show_bug.cgi?id=26865
Summary bugzilla-tool needs to know how to re-order ChangeLogs which git merges wrong
Eric Seidel (no email)
Reported 2009-06-30 14:59:18 PDT
bugzilla-tool needs to know how to re-order ChangeLogs which git merges wrong git svn rebase commonly mis-orders ChangeLogs. bugzilla-tool should know how to repair this and move the relevant ChangeLog entry to the top before submitting via land-diff or land-commits
Attachments
Add attachment proposed patch, testcase, etc.
Mark Rowe (bdash)
Comment 1 2009-06-30 15:22:17 PDT
I believe resolve-ChangeLogs already does this.
Eric Seidel (no email)
Comment 2 2009-06-30 15:45:34 PDT
I believe it does to. But only when there are conflicts. I'm not even sure that there is a way to detect the non-conflict case though...
Mark Rowe (bdash)
Comment 3 2009-06-30 16:00:34 PDT
The -f option of resolve-ChangeLogs handles this in the case where there are no conflicts.
Eric Seidel (no email)
Comment 4 2009-06-30 16:01:29 PDT
So hot! I'll fix bugzilla-tool to know to call resolve-ChangeLogs -f before grabbing the commit message then. :)
Eric Seidel (no email)
Comment 5 2009-10-23 14:29:17 PDT
svn-apply actually does this. Or should do it. I believe I've now fixed svn-apply to handle the extra ChangeLog diff cases which were screwing us before. Duping this against bug 30683. *** This bug has been marked as a duplicate of bug 30683 ***
Note You need to log in before you can comment on or make changes to this bug.