[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: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2002-03-14 23:10:00 CET

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

> Ben Collins-Sussman <sussman@collab.net> writes:
>> My fear is that this is another Linux/BSD discrepancy.

> Oh, lordy. Here we go again. Karl and I came up with a script
> that produces *different* behavior on FreeBSD vs. Linux.
> Everyone take a look at this script, or try it out. On Linux,
> there's no extra newline added. On FreeBSD, there is.

I don't get the extra newline on Mac OS X, Debian GNU/Linux, or NetBSD
(current). On all three platforms i get the following identical
output:

This is a non-conflicting change to line 1.
This is line 2.
This is line 3.
This is line 4.
This is line 5.
This is line 6.
This is line 7.
This is line 8.
This is line 9.
This is line 10 plus some, but still no trailing newline.XXX

(If the XXX appears at the end of line 10, then your diff3 does not
...

NetBSD:
0 ~% diff3 --version
diff3 - GNU diffutils version 2.7
0 ~% which diff3
/usr/bin/diff3

Debian:
0 ~% diff3 --version
diff3 - GNU diffutils version 2.7
0 ~% which diff3
/usr/bin/diff3

Mac OS X:
0 ~% diff3 --version
diff3 - GNU diffutils version 2.7
0 ~% which diff3
/usr/bin/diff3

-- 
Eric Gillespie, Jr. <*> epg@pretzelnet.org
Conformity is a sin.
---------------------------------------------------------------------
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:10:52 2002

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