Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Mar 2001 04:29:44 +0900
From:      "Daniel C. Sobral" <dcs@newsguy.com>
To:        Michael Lucas <mwlucas@blackhelicopters.org>
Cc:        hackers@FreeBSD.ORG
Subject:   Re: context or unified diffs in PRs?
Message-ID:  <3AAA80A8.1C6D6D76@newsguy.com>
References:  <20010310124249.A87381@blackhelicopters.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Michael Lucas wrote:
> 
> 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.

Either will do. Unified diffs are less verbose, but sometimes they are
too confusing to be of any use. The point is to use _either_ of them
instead of plain diff (because both of them have "context" -- lines
indicating the point were the changes are to take place).

-- 
Daniel C. Sobral			(8-DCS)
dcs@newsguy.com
dcs@freebsd.org
capo@the.secret.bsdconspiracy.net

	It's a rewarding life, but hey, somebody has to have all the fun,
right?

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?3AAA80A8.1C6D6D76>