Olaf Hering writes:
> 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.
>
That is the way it used to work. -x now means "pass these flags to the
external diff if we're using it, otherwise ignore them". Perhaps svn
should complain in that situation.
> 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
>
I think this is because svn is not looking in the PATH for the
--diff-cmd. I'm not entirely sure that it should, anyway.
--
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 21 12:58:45 2003