CVS conflict avoidance

[Stephen Williams]

robertl@dgii.com said:
> We have several files in EGCS that are generated from other files in
> EGCS.  These include pairs like configure.in and configure and
> *-parse.y and *-parse.c. 

It is my experience with CVS that generated files, including *-parse.c
and configure and whatever has a source version in CVS, should not ever
be included in the repository. Configure in particular can be generated
automatically by the cvs export process.

The difficulty in this case, however, is arguing over who has the right
version of autoconf/bison/flex/foobar. I suspect that you are using a
different version of autoconf anyhow, otherwise this problem would not
be appearing in the first place:-)

If egcs is very sensitive to the version of autoconf, then perhaps
autoconf needs to be included in cvs as well. If not, then who cares?
keep configure out of CVS! No?

-- 
Steve Williams                "The woods are lovely, dark and deep.
steve@icarus.com              But I have promises to keep,
steve@picturel.com            and lines to code before I sleep,
http://www.picturel.com       And lines to code before I sleep."