Bug 15864: Replace merge-changelog with resolve-ChangeLogs
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Nov 2007 06:00:00 +0000 (06:00 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Nov 2007 06:00:00 +0000 (06:00 +0000)
commit865e8478cc951cf10bea3c2176fa5eb9f88a0e3b
tree02f81b2a98afa4d32fb48c503f136321e89b84dc
parent65e1d8ea49afe0bc7cccca50004270bfebb4f34a
    Bug 15864: Replace merge-changelog with resolve-ChangeLogs
        <http://bugs.webkit.org/show_bug.cgi?id=15864>

        Reviewed by Adam.

        Roll functionality of merge-changelog into resolve-ChangeLogs
        script.  The script now checks for ChangeLog.rej and
        ChangeLog.orig files first.  If it finds them, it uses the
        ChangeLog.rej file as a patch (in old contextual diff format) to
        apply with --fuzz=3.

        * Scripts/merge-changelog: Removed.
        * Scripts/resolve-ChangeLogs: Handle traditional rejected patches.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitTools/ChangeLog
WebKitTools/Scripts/merge-changelog [deleted file]
WebKitTools/Scripts/resolve-ChangeLogs