From owner-freebsd-hackers Sat Mar 10 9:42:52 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from blackhelicopters.org (geburah.blackhelicopters.org [209.69.178.18]) by hub.freebsd.org (Postfix) with ESMTP id 9E2D737B71A for ; Sat, 10 Mar 2001 09:42:50 -0800 (PST) (envelope-from mwlucas@blackhelicopters.org) Received: (from mwlucas@localhost) by blackhelicopters.org (8.9.3/8.9.3) id MAA87406 for hackers@freebsd.org; Sat, 10 Mar 2001 12:42:49 -0500 (EST) (envelope-from mwlucas) Date: Sat, 10 Mar 2001 12:42:49 -0500 From: Michael Lucas To: hackers@freebsd.org Subject: context or unified diffs in PRs? Message-ID: <20010310124249.A87381@blackhelicopters.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. Thanks, Michael -- Michael Lucas mwlucas@blackhelicopters.org http://www.blackhelicopters.org/~mwlucas/ Big Scary Daemons: http://www.oreillynet.com/pub/q/Big_Scary_Daemons To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message