[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-10-16 16:48:15 CEST

"Max Bowsher" <maxb@ukf.net> writes:

>> +++ subversion/libsvn_wc/update_editor.c (working copy)
>> @@ -2203,7 +2203,7 @@
>> svn_path_join (base, base_name,
>> pool),
>> adm_access,
>> oldrev_str, newrev_str, ".mine",
>> - TRUE, &merge_outcome, NULL,
>> + TRUE, &merge_outcome, diff3_cmd,
>> pool));
>>
>> } /* end: working file exists and has mods */
>
> Nope, it's an intentional and rather nasty hack.

It's not documented, and the issue is "fixed" :-(

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Oct 16 16:50:41 2005

This is an archived mail posted to the Subversion Dev mailing list.