26865 2009-06-30 14:59:18 -0700 bugzilla-tool needs to know how to re-order ChangeLogs which git merges wrong 2009-10-23 14:29:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED DUPLICATE 30683 P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 129188 0 eric 2009-06-30 14:59:18 -0700 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 129192 1 mrowe 2009-06-30 15:22:17 -0700 I believe resolve-ChangeLogs already does this. 129198 2 eric 2009-06-30 15:45:34 -0700 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... 129203 3 mrowe 2009-06-30 16:00:34 -0700 The -f option of resolve-ChangeLogs handles this in the case where there are no conflicts. 129204 4 eric 2009-06-30 16:01:29 -0700 So hot! I'll fix bugzilla-tool to know to call resolve-ChangeLogs -f before grabbing the commit message then. :) 157303 5 eric 2009-10-23 14:29:17 -0700 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 ***