Re: [Devil-linux-develop] Any interest in adding Shorewall

[Martin G. <sou...@gl...>]

On December 5, 2003 06:44 am, Bruce Smith wrote:
> > > Look at the man page for "patch", it gives a good example for a
> > > recursive unified diff.
> >
> > I know how to do patch files for single files, but not for complete
> > directories. Do I need to keep 2 copies of my build directories - one
> > with my new files and the other with the standard DL cvs? or can I do a
> > cvs diff somehow?
> >
> > Excuse my ignorance in these matters, but I'm not used to submitting
> > patches.
> >
> > If I try using 2 build directories, this command (from the man page)
> > appears to work...
> > diff -Naur --exclude=tmp  build build.new/ > patchfile.diff
>
> The above command is the correct way to compare every file recursively
> in both directories.  If the new directory doesn't contain all the files
> (you only have you changed files in it), you can remove the "N" option
> from diff and it won't worry about missing files.
>
> If you're only changing one or two files, you might want to do them
> separately and combine the two output files.  i.e.:  diff -u
> build/some/file.old build/some/file >> patchfile
>
> You can also use "cvs diff" to compare your changes to the repository.

Thanks for the help - I'll give it a try next time I submit something. Would 
you prefer I resubmit Shorewall again but now as a patch set?

Martin