Re: How to check in changes?

[<br...@ph...>]

Lars Hecking wrote:

>  Or, if you made the changes in your checked out copy directly, use
>  "cvs diff -u". But then you need to exclude the CVS directories.

Not special work on that needed --- 'cvs diff' already excludes those.

>  The cleanest way is probably:
> 
>  - In the checked-out directory, perform a full build and then "make dist".
>  - Unpack the dist file somewhere else and rename it gnuplot-x.y.z.orig.
>  - Unpack the dist file again in the same directory (gnuplot-x.y.z). This
>    is where you make your edits.

If that's what you want, there's an easier way to get it: use "cvs 
export" instead of "cvs checkout".

>  The -u option creates a unified diff which is more readable than other diff
>  output formats, and -r recurses through the directory tree (not necessary
>  with cvs diff). This will also include every new file as a patch against a
>  zero-size file.

Not quite.  It will report all removed and added files as "Only in 
{old_dir}" or "Only in {new_dir}".  If you want newly created files 
spelled out in the diff, you need the ---unidirectional-new-file option 
of GNU diff (used to be -P), if you want deleted files listed, too, you 
need -N.

A tarball with a diff -ur, plus added files, and a README explaining 
what was done and why may be preferrable to a file-creating diff.

And BTW: it is possible to submit more than one file to an entry in the 
patch tracker --- you can add more files later, once the entry is made. 
  The limit is one file per [Submit] of the page, not one file per 
tracker entry.