This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: problems with cvs -z9 update
- To: egcs at cygnus dot com
- Subject: Re: problems with cvs -z9 update
- From: Raja R Harinath <harinath at cs dot umn dot edu>
- Date: 01 Aug 1998 17:04:46 -0500
- References: <199808011429.QAA01786@jolan.ppro>
Carlo Wood <carlo@runaway.xs4all.nl> writes:
> | errors message :
> | P gcc/c-common.c
> | P gcc/c-decl.c
> | P gcc/c-lex.c
> | M gcc/c-parse.c
> | P gcc/config.sub
> | RCS file: /egcs/carton/cvsfiles/egcs/g,v
> | retrieving revision 1.131
> | retrieving revision 1.135
> | Merging differences between 1.131 and 1.135 into configure
> | rcsmerge: warning: conflicts during merge
> | cvs server: conflicts found in gcc/configure
> | C gcc/configure
> | P gcc/configure.in
> | P gcc/cplus-dem.c
> | and gcc/configure is broken .
> | --
> | ------------------------------------------------------------------------------
> | Markus <markus.kossmann@inka.de> (Markus Kossmann)
>
> I got the exact same problems and had to recheck out everything.
> What version of cvs are you using? (I used 1.9.28.1, a developers version).
This has little to do with `cvs'. `configure' is a generated file. If
the version of `autoconf' you're using is different from the ones used
by Jeff & co., this'll happen.
The only role of `cvs' is that it fetches updated files in alphabetic
order, and `configure' is updated before `configure.in'. The next
`make' thinks that `configure' is out of date, and runs autoconf. The
next `cvs update' to that produces a conflict, if the `autoconf'
versions are different.
The following files probably have this property:
*/configure.in vs. configure
*/<parser>.y vs. <parser>.[ch]
Simple fix: for conflicts on the RHS files, just
rm <conflict-file> && cvs update <conflict-file>
or prevent them by using a two stage update:
cvs update {*,*/*}/*.in {*,*/*}/*.y
cvs update
- Hari
--
Raja R Harinath ------------------------------ harinath@cs.umn.edu
"When all else fails, read the instructions." -- Cahn's Axiom
"Our policy is, when in doubt, do the right thing." -- Roy L Ash