From owner-freebsd-hackers Sat Mar 10 10:36:45 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from critter.freebsd.dk (flutter.freebsd.dk [212.242.40.147]) by hub.freebsd.org (Postfix) with ESMTP id 3B30337B719 for ; Sat, 10 Mar 2001 10:36:43 -0800 (PST) (envelope-from phk@critter.freebsd.dk) Received: from critter (localhost [127.0.0.1]) by critter.freebsd.dk (8.11.1/8.11.1) with ESMTP id f2AIarV39589; Sat, 10 Mar 2001 19:36:53 +0100 (CET) (envelope-from phk@critter.freebsd.dk) To: Michael Lucas Cc: hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? In-Reply-To: Your message of "Sat, 10 Mar 2001 12:42:49 EST." <20010310124249.A87381@blackhelicopters.org> Date: Sat, 10 Mar 2001 19:36:53 +0100 Message-ID: <39587.984249413@critter> From: Poul-Henning Kamp Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message