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 dot kossmann at inka dot de (Markus Kossmann)
- Subject: Re: problems with cvs -z9 update
- From: Carlo Wood <carlo at runaway dot xs4all dot nl>
- Date: Sat, 1 Aug 1998 16:29:13 +0200 (CEST)
- Cc: egcs at cygnus dot com (egcs at cygnus dot com)
| When trying to update my egcs CVS tree IŽam getting the following
| 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).
--
Carlo Wood <carlo@runaway.xs4all.nl>