On Sat, 19 Feb 2000, Steven Elliott wrote:
> Ove Kaaven wrote:
> >
> > There are some issues I don't like about this thing, but I'll limit myself
> > to these two things:
> > 1. Always put /dev/null diffs LAST, after cvs diffs. If I remember right,
> > "patch" may fail to recognize the cvs diffs if you put them first.
>
> I tested it with "patch" version 2.5 on RedHat Linux 6.1. The following
> seems to work:
> patch -p0 < patches/a_patch.diff
> Even when a_patch.diff contains both new files and cvs diff output.
>
> How do you invoke "patch"? I can test that as well.
Often my patches would be applied with -p1. I just recall that there were
some problems with the ordering of "Index:" format, directory diff format,
and plain diff format a year ago or so, patch would misrecognize or eat
lines after the /dev/null diff, or something.
Perhaps it's fixed since then, I haven't tried recently.
> > 2. It'd be nice to be able to only diff the things I really want to
> > submit (i.e. specify arguments to cvs diff).
>
> Something that would act as a regular expression that files would have
> to match in order to be included? Seems like a good idea. I'll look
> into it.
Well, not necessarily regular expressions... I just mean that I can give a
(long) list of directories and filenames to cvs diff, and it would be good
if this tool could do the same.
> > Perhaps the cvs error
> > messages "Nothing known about that file" could make the script the file
> > into the newfile-list to be diffed against /dev/null... your -a option
> > would then be completely unnecessary.
>
> That would make it easier to use. My only hesitation I have is that I
> tend to have various bogus files in my build tree (files backed up to
> .orig and such) that would get included that shouldn't. However,
> combined with your previous suggestion of being able to specify which
> files it would probably work well.
cvs has a list of extensions to ignore, I think...
