From owner-cvs-all Mon Jul 29 14:38:21 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEFD137B408 for ; Mon, 29 Jul 2002 14:38:13 -0700 (PDT) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91C5343E3B for ; Mon, 29 Jul 2002 14:38:11 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 13118 invoked from network); 29 Jul 2002 21:38:10 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 29 Jul 2002 21:38:10 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6TLc9uR051743; Mon, 29 Jul 2002 17:38:09 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020729141730.E29717-100000@www.freebsdmall.com> Date: Mon, 29 Jul 2002 17:38:12 -0400 (EDT) From: John Baldwin To: Chern Lee Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing articl Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, Marc Fonvieille Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 29-Jul-2002 Chern Lee wrote: > > On Mon, 29 Jul 2002, John Baldwin wrote: > >> >> On 29-Jul-2002 Marc Fonvieille wrote: >> > - &prompt.user; diff -c oldfile newfile >> > + &prompt.user; diff -u -c oldfile newfile >> > >> > or >> > >> > - &prompt.user; diff -c -r olddir newdir >> > + &prompt.user; diff -u -c -r olddir newdir >> > >> > -c -u ? It will result in output style conflicts. > > Oops, my mistake... subject of late-night PR closing. > >> >> Hmm, it should only use one. Plus, I think that saying one is always >> preferred over another isn't correct. If you've completely rewritten a >> chunk of code, -c is often easier to read, but if you are changing stuff >> within a few lones, -u is preferred. >> > > I don't think I've ever seen a context diff used in the recent doc world, > but since you're a man of the source I'll make this change. Well, -u is definitely the most common, probably something like: "The preferred diff(1) format for submitting patches is the unified output format generated by 'diff -u'. However, for patches that substantially change a region of code a context output format diff generated by 'diff -c' may be more readable and thus preferable." -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message