[Webkit-unassigned] [Bug 24378] New: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=24378

           Summary: resolve-ChangeLogs should use git status or svn status
                    to find and fix unmerged ChangeLogs
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Macintosh
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: aroben at apple.com


* SUMMARY
It would be nice if resolve-ChangeLogs would have a mode that checked every
locally modified ChangeLog entry when run (with no arguments or -a/--all) and
fixed up any merge conflicts it found.  I'm getting lazy in my old age, and
this would let me be even lazier.

After that:  a post-git-rebase/git-svn-rebase hook in git to run the script
automatically on rebase failure.


-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.