X-Authentication-Warning:	delorie.com: mail set sender to djgpp-workers-bounces using -f
From:	<ams AT ludd DOT ltu DOT se>
Message-Id:	<200403201805.i2KI5oSv007232@speedy.ludd.ltu.se>
Subject:	Re: djgpp/src/docs/kb/develop.txi: How to diff
In-Reply-To:	<o4lo50h9fdkg3uvcsqr5af637j4gi5r6qj@4ax.com> "from Brian Inglis
	at Mar 20, 2004 07:27:07 am"
To:	Brian DOT Inglis AT SystematicSw DOT ab DOT ca
Date:	Sat, 20 Mar 2004 19:05:50 +0100 (CET)
CC:	DJGPP-WORKERS <djgpp-workers AT delorie DOT com>
X-Mailer:	ELM [version 2.4ME+ PL78 (25)]
MIME-Version:	1.0
X-MailScanner:	Found to be clean
Reply-To:	djgpp-workers AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	djgpp-workers AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

Hello.

Hohum. Are you mailing both me and djgpp-workers? If so I'd prefer you
didn't CC me.

If you just mailed me, then you should be aware that this was a patch
I sent to djgpp-workers to see if this addition to the documentation
seemed like a good idea.

I appreciate your comments and please continue to do so, but it would
be better if you mailed djgpp-workers directly so other can see your
comments too.

Note that I'm CCing djgpp-workers.

According to Brian Inglis:
> On Sat, 20 Mar 2004 13:14:19 +0100 (CET), ams AT ludd DOT ltu DOT se wrote:
...
> >+Similarly if you use cvs diff use @samp{cvs -z3 diff -up djgpp} or
> >+@samp{cvs -z3 diff -cp djgpp}.  
> >+
> >+If you have added any new files the option @samp{-N} comes in handy. 
> 
> Okay, that helps a lot, but cvs diff doesn't work with new files in
> the working directory that have not been add-ed, even with -N. 

Thanks.

So how about this (as a non patch this time):

@section Submitting patches

When you prepare a patch use @samp{diff -upr djgpp.old djgpp.new} or
@samp{diff -cpr djgpp.old djgpp.new}.  The directory names
@samp{djgpp.old} and @samp{djgpp.new} are just examples, but you should
preferably use a descriptive name.  If you have added any new files the
option @samp{-N} comes in handy.

Similarly if you use cvs diff use @samp{cvs -z3 diff -up djgpp} or
@samp{cvs -z3 diff -cp djgpp}.  To get cvs diff to notice any new files
you must make cvs aware of them with the cvs add command.


> Regular diff with /dev/null okay? Looks like patch will ignore it;
> other suggestions? 

Of course. Isn't this what diff -rN does? But the relevant part of the
path would be very good to have.


Right,

						MartinS

- Raw text -