From owner-freebsd-hackers Sat Mar 10 12:46:29 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from winston.osd.bsdi.com (winston.osd.bsdi.com [204.216.27.229]) by hub.freebsd.org (Postfix) with ESMTP id C1D3437B719 for ; Sat, 10 Mar 2001 12:46:25 -0800 (PST) (envelope-from jkh@osd.bsdi.com) Received: from localhost (jkh@localhost [127.0.0.1]) by winston.osd.bsdi.com (8.11.2/8.11.1) with ESMTP id f2AKeqH64500; Sat, 10 Mar 2001 12:40:52 -0800 (PST) (envelope-from jkh@osd.bsdi.com) To: phk@critter.freebsd.dk Cc: mwlucas@blackhelicopters.org, hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? In-Reply-To: <39587.984249413@critter> References: <20010310124249.A87381@blackhelicopters.org> <39587.984249413@critter> X-Mailer: Mew version 1.94.1 on Emacs 20.7 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20010310124052O.jkh@osd.bsdi.com> Date: Sat, 10 Mar 2001 12:40:52 -0800 From: Jordan Hubbard X-Dispatcher: imput version 20000228(IM140) Lines: 44 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > Unified diffs are also context diffs. > > Context diffs are named such because they contain undisturbed context > around the changed lines, unlike normal diffs. Erm, no. :) Both context and unidiffs show surrounding context, it's simply the meta-data format which changes. In the case of unidiffs, the presentation of multiple diffs in one file is rather more readable and easy to edit without throwing off patch(1), otherwise they look almost identical in their presentation of "undisturbed context" for one diff: From the diff(1) man page: -c Use the context output format. -u Use the unified output format. [and a list of ten numbers, the new version eliding the "five"] % diff -c numbers.orig numbers *** numbers.orig Sat Mar 10 12:34:51 2001 --- numbers Sat Mar 10 12:34:54 2001 *************** *** 2,8 **** two three four - five six seven eight --- 2,7 ---- % diff -u numbers.orig numbers --- numbers.orig Sat Mar 10 12:34:51 2001 +++ numbers Sat Mar 10 12:34:54 2001 @@ -2,7 +2,6 @@ two three four -five six seven eight To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message