Bug 15864 - Replace merge-changelog with resolve-ChangeLogs
Summary: Replace merge-changelog with resolve-ChangeLogs
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Mac OS X 10.4
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL: http://trac.webkit.org/projects/webki...
Depends on:
Reported: 2007-11-06 19:02 PST by David Kilzer (:ddkilzer)
Modified: 2007-11-25 22:00 PST (History)
1 user (show)

See Also:

Patch v1 (5.63 KB, patch)
2007-11-24 20:17 PST, David Kilzer (:ddkilzer)
aroben: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 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.
Comment 1 David Kilzer (:ddkilzer) 2007-11-24 20:17:35 PST
Created attachment 17496 [details]
Patch v1
Comment 2 Adam Roben (:aroben) 2007-11-25 17:44:46 PST
Comment on attachment 17496 [details]
Patch v1

Comment 3 David Kilzer (:ddkilzer) 2007-11-25 22:00:26 PST
Committed revision 28035.