From owner-freebsd-hackers Sat Mar 10 17: 6:57 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from moby.geekhouse.net (moby.geekhouse.net [64.81.6.36]) by hub.freebsd.org (Postfix) with ESMTP id 1C4EF37B718 for ; Sat, 10 Mar 2001 17:06:54 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: from laptop.baldwin.cx (john@dhcp152.geekhouse.net [192.168.1.152]) by moby.geekhouse.net (8.11.0/8.9.3) with ESMTP id f2B18J152690; Sat, 10 Mar 2001 17:08:21 -0800 (PST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.4.0 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20010310120318O.jkh@osd.bsdi.com> Date: Sat, 10 Mar 2001 17:06:28 -0800 (PST) From: John Baldwin To: Jordan Hubbard Subject: Re: context or unified diffs in PRs? Cc: hackers@FreeBSD.org, mwlucas@blackhelicopters.org Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On 10-Mar-01 Jordan Hubbard wrote: > The handbook is wrong. Unidiffs are a far more advanced lifeform > than context diffs. :) > > - Jordan As phk explained, a unified diff is a context diff. :) If many changed lines are interleaved with unchanged lines, I find that a context diff is far easier to read to understand the change than unified diff. For smaller changes, a unified diff is usually more compact and points out the individual changes more readily. -- John Baldwin -- http://www.FreeBSD.org/~jhb/ PGP Key: http://www.baldwin.cx/~john/pgpkey.asc "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message