[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: Sander Striker <striker_at_apache.org>
Date: 2003-02-16 22:16:38 CET

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

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 16 22:17:19 2003

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