Re: GNU diff or not GNU diff, that is the question...

Kevin Pilch-Bisson <kevin@pilch-bisson.net> writes:

> Maybe sussman remembers better, but what I thought happened was that
> when we switched to using diff3, we decided that we still needed gnu
> diff (since diff3 runs it under the hood), but we could you any diff
> for svn diff. Hence the problem.

Exactly. Our ac-helper scripts look specifically for GNU diff3, but
look for any old program called 'diff'. diff3 is used for merging,
updates, and conflict markers -- the real work. diff is used *only*
to display stuff on the screen when you run 'svn diff'. Hence the lax
requirement.

My mistake here, however, was thinking that every version of 'diff'
out there supports the -u switch. Apparently not!

So yes, we should either stop passing -u (thereby forcing users to
pass -u in via -X, either manually, or config file), or just make our
configuration look for GNU diff.

I prefer the latter option, really. If a system is required to have
GNU diff3, then it will *always* have GNU diff as well. They're both
built and installed by the diffutils package. Better to go for
consistency.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 11 18:29:21 2002