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

Re: Parameters to 'diff'

From: Paul Koning <Paul_Koning_at_dell.com>
Date: Tue, 8 Jul 2008 12:09:44 -0400

>>>>> "John" == John Peacock <john.peacock_at_havurah-software.org> writes:

 John> Michael Maxwell wrote:
>> A couple days ago, in a thread entitled "diff parameters in config
>> file", I asked about using the ~/.subversion/config file to change
>> some things about the way 'svn diff' works. (Specifically, I
>> wanted to change the '-' and '+' tags to the standard '<' and '>'.
>> I forgot to mention that I wanted to turn OFF the '-u' default
>> parameter, which doesn't appear to be possible unless you use a
>> different 'diff'.)

 John> Both context and unified diff formats are more reliable to
 John> apply programmatically and AFAICT most people think easier to
 John> read as well. The commandline option --diff-cmd (points to the
 John> actual diff executable) and the --extensions/-x option (passed
 John> as extended arguments to the above) are there to provide a way
 John> to customize that behavior.

Yes, but svn supplies its own switches in addition to what -x calls
for, and depending on the diff you're invoking that may cause
trouble. For example, --diff-cmd=xxdiff doesn't work because one of
the switches svn insists on passing is one xxdiff doesn't know about.

There should be a way to say "pass these switches AND NO OTHERS".


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-08 18:10:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.