[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2002-03-14 22:55:44 CET

On Thu, 2002-03-14 at 16:37, Thom May wrote:
> Just tested this on OpenBSD-current, and on there diff3 is _not_ adding a
> newline.

I'd like to remind everyone that diff3 works by invoking "diff" on pairs
of files from the command line, and merging those diffs.

So, on OpenBSD and NetBSD, diff3 will do the right thing because they
have an unmodified diff command. (Which can generate diffs which their
own "patch" commands can't understand.)

On FreeBSD, diff3 will do the wrong thing because diff has been crippled
to work with patch.

Nothing surprising here.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 14 23:04:37 2002

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