CVS conflict avoidance

[Branko Cibej]

> I've now experimented with .cvsignore to try to make it ignore only the
> generated files or only the source files, but once files are explictly
> added to the repository (i.e. they appear in CVS/Entries) the .cvsignore
> doesn't seem to matter.

How about having a .cvswrappers entry for such files, e.g.,

     *-parse.c    -m COPY

so that such files aren't merged, but are simply overwritten?
The only problem I see with this is that cvswrappers are supposed to be
unreliable in a client/server setup, but I think the -m option should work.

    Brane

--
Branko Cibej   <branko.cibej@hermes.si>
HERMES SoftLab, Litijska 51, 1000 Ljubljana, Slovenia
phone: (++386 61) 186 53 49  fax: (++386 61) 186 52 70