RESOLVED FIXED 24378
resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs 
https://bugs.webkit.org/show_bug.cgi?id=24378
Summary resolve-ChangeLogs should use git status or svn status to find and fix unmerg...
David Kilzer (:ddkilzer)
Reported 2009-03-05 07:12:13 PST
* 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.
Attachments
Patch v1 (6.56 KB, patch)
2009-03-11 22:34 PDT, David Kilzer (:ddkilzer) 		aroben: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
David Kilzer (:ddkilzer)
Comment 1 2009-03-11 22:34:27 PDT
Created attachment 28520 [details] Patch v1 Proposed fix.
David Kilzer (:ddkilzer)
Comment 2 2009-03-12 06:35:48 PDT
Comment on attachment 28520 [details] Patch v1 > 'git diff'. Added global $ifGit and $ifSVN variables so that Oops...this should be $isGit and $isSVN.
Adam Roben (:aroben)
Comment 3 2009-03-12 07:00:02 PDT
Comment on attachment 28520 [details] Patch v1 r=me
David Kilzer (:ddkilzer)
Comment 4 2009-03-12 07:47:18 PDT
$ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r41623 http://trac.webkit.org/changeset/41623
Note You need to log in before you can comment on or make changes to this bug.