This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: problems with cvs -z9 update
- To: Markus Kossmann <markus dot kossmann at inka dot de>
- Subject: Re: problems with cvs -z9 update
- From: Andreas Jaeger <aj at arthur dot rhein-neckar dot de>
- Date: 01 Aug 1998 14:14:34 +0200
- Cc: egcs at cygnus dot com
- References: <35C2B992.4D7422AC@inka.de>
>>>>> Markus Kossmann writes:
> When trying to update my egcs CVS tree IŽam getting the following
> errors message :
> [...]
> 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 .
That can happen when make decides it has to rebuild configure. Just
do an:
rm gcc/configure;cvs up configure
and everything should be fine again.
Andreas
--
Andreas Jaeger aj@arthur.rhein-neckar.de jaeger@informatik.uni-kl.de
for pgp-key finger ajaeger@alma.student.uni-kl.de