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

Re: diff3 problems

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-14 22:52:30 CET

Ben Collins-Sussman <sussman@collab.net> writes:

> (Note that my FreeBSD's 'diff3' binary still claims to be version 2.7,
> from GNU diffutils. I wonder if it's hacked, though...)

Well, looking at the FreeBSD cvs repository, it's not clear to me
whether they hacked it. Here's the URL:

   http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/diff/

I bet diff3.c shares possibly-hacked code with other diff-related
programs, though.

So I guess the only thing to do is put in a new ac-helper test. We
can use the recently-posted script to check for a legitimate diff3;
but a new calling script should attempt to hunt down binaries not only
named 'diff3', but 'gdiff3' as well. (That's how FreeBSD
differentiates between the version that comes in the base system,
vs. the one built from the diffutils port.)

Any volunteers? :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 14 22:53:26 2002

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