Date: Mon, 29 Jul 2002 08:39:38 -0400 (EDT) From: John Baldwin <jhb@FreeBSD.org> To: Marc Fonvieille <blackend@FreeBSD.org> Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, Chern Lee <chern@FreeBSD.org> Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing articl Message-ID: <XFMail.20020729083938.jhb@FreeBSD.org> In-Reply-To: <20020729142237.C18707@abigail.blackend.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29-Jul-2002 Marc Fonvieille wrote: > On Mon, Jul 29, 2002 at 04:39:05AM -0700, Chern Lee wrote: >> chern 2002/07/29 04:39:05 PDT >> >> Modified files: >> en_US.ISO8859-1/articles/contributing article.sgml >> Log: >> We prefer unified diffs. >> >> Change 'context diff' -> 'unified diff' >> >> PR: docs/38728 >> Submitted by: Pete Zaitcev <zaitcev@yahoo.com> >> >> Revision Changes Path >> 1.488 +3 -3 doc/en_US.ISO8859-1/articles/contributing/article.sgml > > - <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen> > + <screen>&prompt.user; <userinput>diff -u -c oldfile newfile</userinput></screen> > > or > > - <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen> > + <screen>&prompt.user; <userinput>diff -u -c -r olddir newdir</userinput></screen> > > -c -u ? It will result in output style conflicts. 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. > Marc -- John Baldwin <jhb@FreeBSD.org> <>< 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20020729083938.jhb>