[webkit-reviews] review requested: [Bug 15600] prepare-ChangeLog and update-webkit create needless ChangeLog conflicts : [Attachment 16855] Patch v2

[bugzilla-daemon at webkit.org]

David Kilzer (ddkilzer) <ddkilzer at webkit.org> has asked  for review:
Bug 15600: prepare-ChangeLog and update-webkit create needless ChangeLog
conflicts
http://bugs.webkit.org/show_bug.cgi?id=15600

Attachment 16855: Patch v2
http://bugs.webkit.org/attachment.cgi?id=16855&action=edit

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
Introducing the resolve-ChangeLogs script, which does exactly what its name
suggests.  It may be run in stand-alone mode (for those that like to run 'svn
up' on their own), and is integrated with prepare-ChangeLog and update-webkit
in case either of those scripts run into a conflicted ChangeLog.

Note that I've tested resolve-ChangeLogs running forwards and backwards in
history, and it works both ways because it matches the current file's revision
with the conflict file created with the matching extension *to find the "newer"
version of the file).  I also assume git won't lie about the mine/ours/theirs
stages regardless of how you're merging.  File names used for merging in git
were made to match those used in git-mergetool.