From owner-freebsd-hackers Sat Mar 10 12:50:29 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 D8D8A37B719 for ; Sat, 10 Mar 2001 12:50:26 -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 f2AKoeV40513; Sat, 10 Mar 2001 21:50:40 +0100 (CET) (envelope-from phk@critter.freebsd.dk) To: Jordan Hubbard Cc: mwlucas@blackhelicopters.org, hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? In-Reply-To: Your message of "Sat, 10 Mar 2001 12:40:52 PST." <20010310124052O.jkh@osd.bsdi.com> Date: Sat, 10 Mar 2001 21:50:40 +0100 Message-ID: <40511.984257440@critter> From: Poul-Henning Kamp Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG In message <20010310124052O.jkh@osd.bsdi.com>, Jordan Hubbard writes: >> 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: I repeat, with added emphasis: >> Unified diffs are *also* context diffs. >> >> Context diffs are named such because they contain undisturbed context >> around the changed lines, unlike *normal* diffs. -- 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