Bug 24378 - resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs
Summary: resolve-ChangeLogs should use git status or svn status to find and fix unmerg...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Mac OS X 10.5
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-03-05 07:12 PST by David Kilzer (:ddkilzer)
Modified: 2009-03-12 07:47 PDT (History)
1 user (show)

See Also:

Attachments
Patch v1 (6.56 KB, patch)
2009-03-11 22:34 PDT, David Kilzer (:ddkilzer) 		aroben: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 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.
Comment 1 David Kilzer (:ddkilzer) 2009-03-11 22:34:27 PDT 
Created attachment 28520 [details]
Patch v1

Proposed fix.
Comment 2 David Kilzer (:ddkilzer) 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.
Comment 3 Adam Roben (:aroben) 2009-03-12 07:00:02 PDT 
Comment on attachment 28520 [details]
Patch v1

r=me
Comment 4 David Kilzer (:ddkilzer) 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