This is the mail archive of the gcc-bugs@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: java parse.c broken (cvs version 18.4. 10:00 GMT)


> Date: Tue, 18 Apr 2000 13:38:17 +0200
> From: jarausch@igpm.rwth-aachen.de

> Looking at gcc/java/parse.c
> it's indeed strange
> lines 520 onwards
> <<<<<<< parse.c
> <<<<<<< parse.c
> #define YYTRANSLATE(x) ((unsigned)(x) <= 363 ? yytranslate[x] : 267)
> =======
> #define YYTRANSLATE(x) ((unsigned)(x) <= 363 ? yytranslate[x] : 272)
> >>>>>>> 1.134
> =======
> #define YYTRANSLATE(x) ((unsigned)(x) <= 364 ? yytranslate[x] : 272)
> >>>>>>> 1.137

> Thanks for a hint how to fix.

Yes.  Do not run cvs update by hand.  Use contrib/gcc_update instead.
If you want to not do this, then you have to review local differences
in your source tree, and handle them.  Use cvs diff -r . to find them.
In particular, it would have shown you this problem.  It was caused by
updating your tree with a cvs command and running make, and then
updating the source tree and running make again.  On the second
update, it merged in this conflict and reported the conflict to you
via a `C' line.  You ignored it (you can't ignore them), you must
resolve them.

The simplest way to fix it, is to rm parse.c, and recvs update it.

If you want to learn more, check out the cvs documentation on what a
merge is, what a conflict is...

Hope this helps.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]