Bug 21185: resolve-ChangeLogs should be able to fix poorly merged ChangeLog...
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Sep 2008 23:57:03 +0000 (23:57 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Sep 2008 23:57:03 +0000 (23:57 +0000)
commitffad987e0f188ab6ae9e9a0c9adfef3a68f87ec6
tree47f95629f63a23d1a0133e9f2ea78c6e4fa148bb
parent100d90f247544b3e05ef3679df57d318db1629a9
    Bug 21185: resolve-ChangeLogs should be able to fix poorly merged ChangeLog entries after a git svn rebase

        <https://bugs.webkit.org/show_bug.cgi?id=21185>

        Reviewed by Adam.

        * Scripts/resolve-ChangeLogs: Added new -f|--fix-merge switch that
        will attempt to reapply the last commit to a ChangeLog file such
        that the ChangeLog entry appears at the top of the file.
        (findChangeLog): Added prototype and moved method below the exit
        statement.
        (fixMergedChangeLog): Added.  Method to fix incorrectly merged
        ChangeLog entries.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@37047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitTools/ChangeLog
WebKitTools/Scripts/resolve-ChangeLogs