From owner-freebsd-hackers Sat Mar 10 11:33: 4 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from peach.ocn.ne.jp (peach.ocn.ne.jp [210.145.254.87]) by hub.freebsd.org (Postfix) with ESMTP id 78F5C37B719 for ; Sat, 10 Mar 2001 11:32:56 -0800 (PST) (envelope-from dcs@newsguy.com) Received: from newsguy.com (p31-dn02kiryunisiki.gunma.ocn.ne.jp [211.0.245.96]) by peach.ocn.ne.jp (8.9.1a/OCN/) with ESMTP id EAA05419; Sun, 11 Mar 2001 04:32:44 +0900 (JST) Message-ID: <3AAA80A8.1C6D6D76@newsguy.com> Date: Sun, 11 Mar 2001 04:29:44 +0900 From: "Daniel C. Sobral" X-Mailer: Mozilla 4.7 [en] (Win98; I) X-Accept-Language: en,pt-BR MIME-Version: 1.0 To: Michael Lucas Cc: hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? References: <20010310124249.A87381@blackhelicopters.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Michael Lucas wrote: > > 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. > > Is the Handbook correct, or are unified diffs preferred? I'll be > happy to fix my article and submit a PR to correct the Handbook if > this is the case. Either will do. Unified diffs are less verbose, but sometimes they are too confusing to be of any use. The point is to use _either_ of them instead of plain diff (because both of them have "context" -- lines indicating the point were the changes are to take place). -- Daniel C. Sobral (8-DCS) dcs@newsguy.com dcs@freebsd.org capo@the.secret.bsdconspiracy.net It's a rewarding life, but hey, somebody has to have all the fun, right? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message