[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Any CVS tricks for creating patch files?

From: Spiro Trikaliotis
Subject: Re: Any CVS tricks for creating patch files?
Date: Tue, 8 Jun 2004 20:29:37 +0200
User-agent: Mutt/1.5.6i

Hello Jim,

* On Tue, Jun 08, 2004 at 09:03:27AM -0400 Jim.Hyslop wrote:
> Spiro Trikaliotis wrote:
> > $ cvs rdiff -uN -r Release_0_1 -r Releae_0_1_Bugfixes > 
> What does the -N flag do? It isn't documented.

forget it, it is non-existant with rdiff, while it exists with diff. So
it is my fault.

with "diff" (not cvs diff), the option -N tells diff to treat files
which are non-existant in one directory as if it was there, but empty.
This way, the diff is complete. If you do not specify -N, diff only
tells you that some file was missing, but you don't see the contents of

As I said, this option is missing with "cvs rdiff", while it exists with
"cvs diff" (cvs 1.11.16). Is this difference "by intention", or is it
accidentially? I would find it very usefull for rdiff.

The following simple skript demonstrates this:

#! /bin/bash

export CVSROOT=~/test.cvsroot/

cvs init
mkdir ~/test.cvsroot/test/

cvs co test
cd test

cat > f1 <<%
This is file 1

cvs add f1
cvs commit -m "First version"
cvs tag v1

cat > f2 <<%
This is file 2

cvs add f2
cvs commit -m "2nd version"
cvs tag v2

rm f1
cvs rm f1
cvs commit -m "3rd version"
cvs tag v3

cvs diff -u -r v2 > ../v2_v3.diff
cvs diff -u -r v1 > ../v1_v3.diff

cvs diff -uN -r v2 > ../v2_v3_N.diff
cvs diff -uN -r v1 > ../v1_v3_N.diff


Spiro R. Trikaliotis         I'm subscribed to the mailing lists I'm posting,  so please refrain from Cc:ing me. Thank you.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]