From owner-freebsd-hackers Sat Mar 10 10:52:38 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from fw.wintelcom.net (ns1.wintelcom.net [209.1.153.20]) by hub.freebsd.org (Postfix) with ESMTP id 2C1AF37B718 for ; Sat, 10 Mar 2001 10:52:34 -0800 (PST) (envelope-from bright@fw.wintelcom.net) Received: (from bright@localhost) by fw.wintelcom.net (8.10.0/8.10.0) id f2AIoPb10093; Sat, 10 Mar 2001 10:50:25 -0800 (PST) Date: Sat, 10 Mar 2001 10:50:25 -0800 From: Alfred Perlstein To: Poul-Henning Kamp Cc: Michael Lucas , hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? Message-ID: <20010310105020.C18351@fw.wintelcom.net> References: <20010310124249.A87381@blackhelicopters.org> <39587.984249413@critter> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <39587.984249413@critter>; from phk@critter.freebsd.dk on Sat, Mar 10, 2001 at 07:36:53PM +0100 X-all-your-base: are belong to us. Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG * Poul-Henning Kamp [010310 10:37] wrote: > In message <20010310124249.A87381@blackhelicopters.org>, Michael Lucas writes: > >Hello, > > > >I'm afraid I might be walking up to a bikeshed with a can of paint > >here, but the flood of email in the last twenty-four hours has > >convinced me to ask. > > > >In an article O'Reilly published yesterday, I stated (per the > >Handbook) that context diffs were the correct way to submit patches > >with PRs. I've had several people claim that unified diffs are the > >way to go, and that the handbook is just wrong. > > Unified diffs are also context diffs. > > Context diffs are named such because they contain undisturbed context > around the changed lines, unlike normal diffs. > > Unified diffs are generally smaller than "plain" context diffs, and > some people find them more readable and some don't. It's usually a judgement call, depending on the change a context diff can be less of a pain to read. -- -Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message