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

Re: svn diff does not ignore whitespaces

From: Olaf Hering <olh_at_suse.de>
Date: 2003-03-21 11:27:35 CET

 On Fri, Mar 21, Robert Pluim wrote:

> Olaf Hering writes:
> > svn does ignore my ~/.subversion/config:
> > [helpers]
> > editor-cmd = vim -c 'set tw=72 et'
> > diff_cmd = /home/olaf/bin/diff
> > diff3_cmd = /home/olaf/bin/diff
>
> The name of the diff command option in config changed from 'diff_cmd'
> to 'diff-cmd' at some point fairly recently (I'm assuming your
> editor-cmd works).

Yes, you are right.

What I do not understand is, why does it not work like that:

svn diff uses internal diff
svn diff uses diff-cmd if specified in the config

svn diff -x -p uses internal diff.
Why? it should call 'diff' from the $PATH, I would assume that -x
implies 'external', either from PATH or from config.

An odd thing:
svn diff -x -puBbw --diff-cmd true -r 5411:5418 subversion/tests/clients/cmdline/commit_tests.py
Index: subversion/tests/clients/cmdline/commit_tests.py
===================================================================
svn: Error calling external program
svn: 'true' returned 255

true -puBbw -L 'subversion/tests/clients/cmdline/commit_tests.py (revision 5411)' -L 'subversion/tests/clients/cmdline/commit_tests.py (revision 5418)' tmp tmp.2 ; echo $?
0

Is there a reason why -x does require --diff-cmd if no diff-cmd is
specified in the config file? I would call that a bug.

Gruss Olaf

-- 
USB is for mice, FireWire is for men!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 21 11:28:25 2003

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

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