Date: Mon, 29 Jul 2002 17:38:12 -0400 (EDT) From: John Baldwin <jhb@FreeBSD.org> To: Chern Lee <chern@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, Marc Fonvieille <blackend@FreeBSD.org> Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing articl Message-ID: <XFMail.20020729173812.jhb@FreeBSD.org> In-Reply-To: <20020729141730.E29717-100000@www.freebsdmall.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29-Jul-2002 Chern Lee wrote: > > On Mon, 29 Jul 2002, John Baldwin wrote: > >> >> On 29-Jul-2002 Marc Fonvieille wrote: >> > - <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. > > 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 <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.20020729173812.jhb>