Re: How to check in changes?

[Lars H. <lhe...@us...>]

 
> OK.  Exactly what format of diff-ing should I use, and against what,
> to create the patch?  A cvs diff against the head?  A diff against 4.0?
> What options on the diff command?
>  
> Also, there are some new test scripts and test data files to demonstrate
> cases where the existing fits do the wrong thing, and that the changes make
> it do the right thing.  How should that be handled?  It appears that the patch
> submission page on sourceforge expects only one file per patch.  Should I
> tar together the diff output and the new test scripts and data files?  Or make
> multiple "patches"?
 
 You have two gnuplot directory trees: the original, be it off cvs or
 4.0, and your edited tree. Then you just run

$ ls
gnuplot-x.y.z.orig gnuplot-x.y.z
$ diff -ur gnuplot-x.y.z.orig gnuplot-x.y.z >foobar.diff
$ gzip/compress/whatever foobar.diff

 and upload the gzipped diff file.

 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.

 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.

 The first step is not needed if you start from a distribution archive.

 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.