From owner-cvs-all  Mon Jul 29  5:39:44 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 20AEF37B406
	for <cvs-all@FreeBSD.org>; Mon, 29 Jul 2002 05:39:35 -0700 (PDT)
Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B083743E6A
	for <cvs-all@FreeBSD.org>; Mon, 29 Jul 2002 05:39:33 -0700 (PDT)
	(envelope-from jhb@FreeBSD.org)
Received: (qmail 6170 invoked from network); 29 Jul 2002 12:39:32 -0000
Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender <jhb@FreeBSD.org>)
          by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP
          for <chern@FreeBSD.org>; 29 Jul 2002 12:39:32 -0000
Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4])
	by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6TCdVuR050193;
	Mon, 29 Jul 2002 08:39:31 -0400 (EDT)
	(envelope-from jhb@FreeBSD.org)
Message-ID: <XFMail.20020729083938.jhb@FreeBSD.org>
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: <20020729142237.C18707@abigail.blackend.org>
Date: Mon, 29 Jul 2002 08:39:38 -0400 (EDT)
From: John Baldwin <jhb@FreeBSD.org>
To: Marc Fonvieille <blackend@FreeBSD.org>
Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/contributing articl
Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org,
	Chern Lee <chern@FreeBSD.org>
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG


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