Date: Sat, 10 Mar 2001 21:50:40 +0100 From: Poul-Henning Kamp <phk@critter.freebsd.dk> To: Jordan Hubbard <jkh@osd.bsdi.com> Cc: mwlucas@blackhelicopters.org, hackers@FreeBSD.ORG Subject: Re: context or unified diffs in PRs? Message-ID: <40511.984257440@critter> In-Reply-To: Your message of "Sat, 10 Mar 2001 12:40:52 PST." <20010310124052O.jkh@osd.bsdi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?40511.984257440>