[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: Thom May <thom_at_planetarytramp.net>
Date: 2002-03-14 22:37:48 CET

* Garrett Rooney (rooneg@electricjellyfish.net) wrote :
> On Thu, Mar 14, 2002 at 03:24:14PM -0600, Ben Collins-Sussman wrote:
> > 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.
> >
> > (Note that my FreeBSD's 'diff3' binary still claims to be version 2.7,
> > from GNU diffutils. I wonder if it's hacked, though...)
>
> i imagine it's the same kind of issue as we had with FreeBSD's diff and
> patch. they may claim to be the GNU versions, but they are hacked.
> you can confirm it by checking the version in FreeBSD cvs if you want,
> but the fact that you have a script that produces different results
> indicates to me that we'll need to go to searching for gnu diff3 like
> we used to do for patch and diff. it sucks, but if that's what we
> have to do, that's what we have to do.
>
> -garrett
>
Just tested this on OpenBSD-current, and on there diff3 is _not_ adding a
newline.
21:37 eulogy:~% diff3 --version
diff3 - GNU diffutils version 2.7
21:37 eulogy:~% uname -a
OpenBSD eulogy 3.0 EULOGY#0 i386

just FYI.
-Thom

---------------------------------------------------------------------
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:39:00 2002

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