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

Re: svn diff uses internal diff!

From: Branko Čibej <brane_at_xbc.nu>
Date: 2003-02-17 00:15:56 CET

Sander Striker wrote:

>>From: Philip Martin
>>Sent: Sunday, February 16, 2003 2:32 PM
>>
>>
>
>[...]
>
>
>>I have no problem with the internal diff/merge being enabled as the
>>default right now, but until we have more regression tests I think we
>>should provide an option to allow a paranoid user to disable use of
>>the internal library and fall back on the external programs.
>>
>>
>
>I've enabled it now. Paranoid users can disable it by setting diff3-cmd
>in .subversion/config. I was hoping that I also had the --diff3-cmd
>on the commandline covered, but Garrett told me otherwise. It seems that
>the config hash is not passed through libsvn_wc/log.c. Internally it
>creates a new config hash and passes that to svn_wc_merge, discarding the
>overrides.
>
>
The regression tests on Windows pass (yes, I did remember to coment out
the diff settings in the config file).

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 17 00:16:38 2003

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