From owner-freebsd-arch Fri Mar 22 6:17:40 2002 Delivered-To: freebsd-arch@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6545A37B41D; Fri, 22 Mar 2002 06:17:36 -0800 (PST) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g2MEHZ958962; Fri, 22 Mar 2002 09:17:35 -0500 (EST) (envelope-from green@green.bikeshed.org) Message-Id: <200203221417.g2MEHZ958962@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: "M. Warner Losh" Cc: roberto@keltia.freenix.fr, arch@FreeBSD.ORG, rooneg@electricjellyfish.net Subject: Re: Diffutils In-Reply-To: Your message of "Fri, 22 Mar 2002 06:37:51 MST." <20020322.063751.68160149.imp@village.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 22 Mar 2002 09:17:35 -0500 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 "M. Warner Losh" wrote: > In message: <20020322063236.GA19699@tara.freenix.org> > Ollivier Robert writes: > : According to M. Warner Losh: > : > I have talked with green about this. He'd like me to fix patch to > : > grok the generated diffs first. > : > : Why? Do we also have a modified patch? The original GNU patch with the > : original GNU diffutils work fine so what's there to fix? > : > : I'm confused. I seem to recall that at one point we went to patch 2.5 then > : back but that's about it... > > The patch that we have in the tree is 2.1 and doesn't grok the missing > end of line stuff. The 2.5 that we also have in the tree doesn't work > with cvs diffs :-(. Our patch 2.1 is also broken on certain "large" patches I've encountered (extremely long lines, for example, seemed to be one issue). Our patch is also a lot more verbose than patch 2.5. So, just for the record, there are more than a couple small differences... -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message