[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
----------------------------------------------------------------------------
                 CC|                            |ddkilzer at webkit.org




------- Comment #2 from ddkilzer at webkit.org  2007-10-21 16:19 PDT -------
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".

This mail message says that returning a non-zero exit status from the command
(let's call it update-webkit-diff3) will leave a file in the conflicted state:

http://svn.haxx.se/users/archive-2004-09/1132.shtml

So the script just has to do the following:

1. If the merged filename is not "ChangeLog", return a non-zero exit status.
2. Else merge the ChangeLog entry without conflicts, clean up the files created
and return a zero exit status.

This contrib Perl script for Subversion may have some clues as well (although
it does 3-way merges after the conflicts occur by using "svn update
--diff3-cmd=/bin/false"):

http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn_update.pl


-- 
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.