[Webkit-unassigned] [Bug 15600] update-webkit creates needless ChangeLog conflicts

[bugzilla-daemon at webkit.org]

http://bugs.webkit.org/show_bug.cgi?id=15600


ddkilzer at webkit.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED




------- Comment #4 from ddkilzer at webkit.org  2007-10-21 18:15 PDT -------
(In reply to comment #2)
> Interesting.  I've never used the update-webkit script, but it may be worth
> looking into creating a custom "diff3" command that is passed to --diff3-cmd
> when running "svn update".

I've written update-webkit-diff3.  It creates a patch using "diff -u" between
the local changed file and the previous file, then applies this patch using
"patch --fuzz=3" to prevent unwanted conflicts in ChangeLog files (just like
svn-apply now does).

(In reply to comment #3)
> If ChangeLog local changes are only lines at the top, save them, remove them,
> update ChangeLog, then paste new lines back at the top. I'd love to see a
> version like that folded into prepare-ChangeLog.

I didn't realize that prepare-ChangeLog could use the script as well.  I'll
make this change and submit a patch.


-- 
Configure bugmail: http://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.