Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Nov 2002 16:49:26 -0500
From:      Garance A Drosihn <drosih@rpi.edu>
To:        arch@FreeBSD.ORG
Cc:        re@FreeBSD.ORG, imp@village.org
Subject:   Re: diff & patch problem with 'No newline'
Message-ID:  <p05200f00b9fc6a9d1749@[128.113.24.47]>
In-Reply-To: <20020426.095955.80136029.imp@village.org>
References:  <p05111718b8ee70b3633a@[128.113.24.47]> <1019819253.450.389.camel@gurney.reilly.home> <p0511171bb8ef272024ba@[128.113.24.47]> <20020426.095955.80136029.imp@village.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Back in April 2002, we went through a debate on getting 'diff' to
generate the line "No newline at end-of-file" for the situation
where one file has a newline as it's last character, and the other
file (being compared by diff) does not have that last newline.

At the time, the stumbling block was that our version of patch
did not understand what to do with that line.  A few years ago,
Brian Feldman (aka green@FreeBSD.org) changed our diff to *not*
put that line out, because of the issue with patch.

Back on April 26/2002, M. Warner Losh wrote:
>My plans had always been to back out Green's change (with Green's
>permission, btw) when there was a patch that could grok things.
>The back out wouldn't be MFC'd until after at least one release.
>Since this was historical FreeBSD behavior, and modern patches
>grok the end of line things, I see this as a no brainer: just do
>it once patch is patched :-)

I installed changes to our 'patch' so it does the right thing with
the "No newline" line.  This was MFC'ed just before 4.6-release.
We're now past 4.7-release.  I would like to now make the one-line
change to 'diff' so it will (once again) generate that line, and
I would like to do that before 5.0-release, and also MFC it into
-stable.  I assume people would prefer that I do it after 5.0-dp2,
but I would like to get it in for 5.0-release.

Would this be okay with everyone, particularly with re@freebsd?

-- 
Garance Alistair Drosehn            =   gad@gilead.netel.rpi.edu
Senior Systems Programmer           or  gad@freebsd.org
Rensselaer Polytechnic Institute    or  drosih@rpi.edu

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p05200f00b9fc6a9d1749>