[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Unresolved CVS conflict
From: |
Etienne Gagnon |
Subject: |
Unresolved CVS conflict |
Date: |
Sun, 28 Mar 2004 13:23:33 -0500 |
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.6) Gecko/20040314 Debian/1.6-3 |
Hi Greg,
When you see a message from CVS telling about conflicts, you must
try to resolve all conflicts. You can find them using:
$ grep -r '>>>>>' *
FYI, somewhere in the following, you left an unresolved conflict in
the ChangeLog file:
2004-03-28 00:27 gadek
* ChangeLog, vm/reference/java/lang/reflect/Constructor.java,
vm/reference/java/lang/reflect/Field.java,
vm/reference/java/lang/reflect/Makefile.am,
vm/reference/java/lang/reflect/Method.java,
vm/reference/java/lang/reflect/ReflectUtil.java: 2004-03-28
Grzegorz B. Prokopski <address@hidden>
* Merged vm/reference implementation of these reflection
elements,
that can be realized in Java:
vm/reference/java/lang/reflect/Constructor.java,
vm/reference/java/lang/reflect/Field.java,
vm/reference/java/lang/reflect/Makefile.am,
vm/reference/java/lang/reflect/Method.java,
vm/reference/java/lang/reflect/ReflectUtil.java.
2004-03-27 20:21 gadek
* ChangeLog, acinclude.m4, configure.ac: 2004-03-27 Grzegorz B.
Prokopski <address@hidden>
* configure.ac: Added --with-jvm= handling defaulting to
'none'.
* acinclude.m4: Don't build .zip for --with-jvm=sablevm.
2004-03-27 17:23 gadek
* ChangeLog, java/lang/Object.java, java/lang/Throwable.java,
java/lang/reflect/Array.java: 2004-03-27 Grzegorz B. Prokopski
<address@hidden>
* java/lang/Object.java (static): Remove static
initializer.
* java/lang/reflect/Array.java (static): Remove static
initializer.
* java/lang/Throwable.java (nl): Remove static field.
(StaticData): New private static inner class.
(stackTraceStringBuffer): Use StaticData.nl.
(above was extracted using cvs2cl).
Have fun!
Etienne
--
Etienne M. Gagnon, Ph.D. http://www.info.uqam.ca/~egagnon/
SableVM: http://www.sablevm.org/
SableCC: http://www.sablecc.org/
- Unresolved CVS conflict,
Etienne Gagnon <=