From owner-freebsd-arch Sat Nov 16 13:50: 6 2002 Delivered-To: freebsd-arch@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51CF137B404; Sat, 16 Nov 2002 13:50:04 -0800 (PST) Received: from mail.rpi.edu (mail.rpi.edu [128.113.22.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F24943E42; Sat, 16 Nov 2002 13:50:03 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.12.1/8.12.1) with ESMTP id gAGLnR8L289180; Sat, 16 Nov 2002 16:49:27 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <20020426.095955.80136029.imp@village.org> References: <1019819253.450.389.camel@gurney.reilly.home> <20020426.095955.80136029.imp@village.org> Date: Sat, 16 Nov 2002 16:49:26 -0500 To: arch@FreeBSD.ORG From: Garance A Drosihn Subject: Re: diff & patch problem with 'No newline' Cc: re@FreeBSD.ORG, imp@village.org Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.3 (www dot roaringpenguin dot com slash mimedefang) Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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