How to generate patches (was Re: [Mono-list] Javascript and Mono)

Dick Porter dick@ximian.com
07 Jan 2003 11:07:51 +0000


On Mon, 2003-01-06 at 22:35, Jeroen Janssen wrote:
> Basicly, if you want to generate a patch (for multiple sources) then you 
> use 2 directories: 1 'original', 1 'modified' directory.
> And then cvs diff -r -u <newdir> <olddir> (which generates the patch to 
> std-out).

No, its "cvs diff -N -u",  or "diff -r -N -u olddir newdir" (depending
on whether you're working from CVS files or not).

The -N shows new files.  And you can add "diff -u" to ~/.cvsrc so you
don't have to include it every time, because all diffs should be in
unified format.
 
List the original dir first or you will generated a reverse patch.  See
"man diff" for lots more useful switches.

- Dick