From owner-freebsd-standards Sat Feb 9 20:27:48 2002 Delivered-To: freebsd-standards@freebsd.org Received: from mail.rpi.edu (mail.rpi.edu [128.113.22.40]) by hub.freebsd.org (Postfix) with ESMTP id 9B6C537B400 for ; Sat, 9 Feb 2002 20:27:46 -0800 (PST) Received: from [128.113.24.47] (gilead.acs.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.11.3/8.11.3) with ESMTP id g1A4Pac96004; Sat, 9 Feb 2002 23:25:36 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <20020209194629.A11392@chiark.greenend.org.uk> References: <20020209140259.A51448@descent.robbins.dropbear.id.au> <20020209194629.A11392@chiark.greenend.org.uk> Date: Sat, 9 Feb 2002 23:25:35 -0500 To: Tony Finch , fyre@orbital.wiretapped.net From: Garance A Drosihn Subject: Re: diff problem Cc: "M. Warner Losh" , freebsd-standards@FreeBSD.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-standards@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG At 7:46 PM +0000 2/9/02, Tony Finch wrote: >On Sat, Feb 09, 2002 at 02:02:59PM +1100, Tim Robbins wrote: >> >> I have absolutely no idea why we have both version 2.5 and version 2.1 of >> patch in the tree. 2.5 lives in /usr/src/contrib/patch, 2.1 lives in >> /usr/src/gnu/usr.bin/patch. Version 2.1 ends up in /usr/bin, version 2.5 >> is not installed anywhere I can find. > >The reason for this is that versions of `patch` after 2.1 do not correctly >handle the output of `cvs diff`. For example, on FreeBSD-4.5-STABLE, first >using `patch` 2.5 then using `patch` 2.1: The problem you demonstrate here is separate from the newline issue, and based on that example I do agree that would be much too disruptive for us to just drop in patch 2.5. But we could have our patch understand that one "\ missing newline" option in a patch. Adding that support should not break any patches which currently work. -- Garance Alistair Drosehn = gad@eclipse.acs.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-standards" in the body of the message