[Freeciv-Dev] Re: Question about cvs

[Reinier Post <rp@xxxxxxxxxx>]

On Fri, Jul 25, 2003 at 04:38:53AM -0400, Jason Short wrote:
> Lobo Gris wrote:
> > Does Somebody know which option must I give to "cvs diff" in order to 
> > include the .c and .h files that I created but aren't on the cvs 
> > repository? I tested with "cvs diff -Nu" but doesn't work (the -N should do 
> > that)
> 
> "cvs diff" cannot do this.  You have several options:
> 
> - Use 'diff' instead of cvs diff.  Here you have to have two separate 
> repositories - one original and one new.  Use something like "diff 
> -Xfreeciv/diff_ignore freeciv-old freeciv".
> 
> - Package the extra .[ch] files separately.  This is what I usually do - 
> just make a diff of the existing files and include the new files as 
> extra attachments.  It is faster but takes more work for the user of 
> your patch.

Or you can just concatenate the diffs you get, if they have consistent
pathnames (taken from the same directory).

-- 
Reinier