Robert Pluim <rpluim@bigfoot.com> wrote:
> Rafael Garcia-Suarez writes:
>
> > If I understand correctly, the internal diff is used by default by
> > "svn diff", except when one of the following is true :
> >
> > 1. -x is used
> > 2. --diff-cmd is used
> > 3. diff-cmd is set in the config file
> >
>
> I think -x is ignored silently when the (2) and (3) are not true:
I was confused.
Anyway, ignoring it silently is not a good thing.
> > In this case, at least the following doc patch is needed.
> >
>
> Looks good to me (but then I'm suffering from sleep deprivation ;-)
>
> > Moreover, there's a situation which can't be configured, apparently :
> > when one wants to use the internal diff by default, but
> > /some/unsual/path/to/diff when -x is specified. Maybe a new option in
> > config/[helpers] is needed to handle this case.
>
> Hmm, does that happen often enough to make it useful? I only run the
> external diff when I need to ignore whitespace changes, which is not
> that often.
I use -p and -F quite often (depending on the files diff'ed).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 14 14:11:18 2003