Bug 15864

Summary: Replace merge-changelog with resolve-ChangeLogs
Product: WebKit Reporter: David Kilzer (:ddkilzer) <ddkilzer>
Component: Tools / TestsAssignee: David Kilzer (:ddkilzer) <ddkilzer>
Status: RESOLVED FIXED    
Severity: Normal CC: darin
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Mac   
OS: OS X 10.4   
URL: http://trac.webkit.org/projects/webkit/browser/trunk/WebKitTools/Scripts/merge-changelog
Attachments:
Description Flags
Patch v1 aroben: review+

David Kilzer (:ddkilzer)
Reported 2007-11-06 19:02:18 PST
The merge-changelog script was more useful when svn-apply/svn-unapply didn't use --fuzz=3 when applying ChangeLog patches, or when applying a patch using good ol' patch(1). The resolve-ChangeLogs script should probably subsume the merge-changelog functionality, and then merge-changelog may go away.
Attachments
Patch v1 (5.63 KB, patch)
2007-11-24 20:17 PST, David Kilzer (:ddkilzer) 		aroben: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
David Kilzer (:ddkilzer)
Comment 1 2007-11-24 20:17:35 PST
Created attachment 17496 [details] Patch v1
Adam Roben (:aroben)
Comment 2 2007-11-25 17:44:46 PST
Comment on attachment 17496 [details] Patch v1 r=me
David Kilzer (:ddkilzer)
Comment 3 2007-11-25 22:00:26 PST
Committed revision 28035.
Note You need to log in before you can comment on or make changes to this bug.