From: Archie Cobbs (archie@whistle.com)
Date: Mon Jan 11 1999 - 16:26:39 EST
While doing a cvs update -dP...
RCS file: /home/cvspublic/kaffe/config/stamp-h1.in,v
retrieving revision 1.6
retrieving revision 1.8
Merging differences between 1.6 and 1.8 into stamp-h1.in
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in config/stamp-h1.in
C config/stamp-h1.in
P include/Makefile.am
P include/Makefile.in
RCS file: /home/cvspublic/kaffe/include/stamp-h2.in,v
retrieving revision 1.6
retrieving revision 1.8
Merging differences between 1.6 and 1.8 into stamp-h2.in
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in include/stamp-h2.in
C include/stamp-h2.in
This is weird, because before I had only done a single build
from a different directory.
It appears that kaffe:
(a) Is self-modifying repository files
(b) Is doing so in such a way that causes CVS conflicts
(c) Is modifying source files even when building from a different
directory, making a build from a 'read-only' source impossible
I think all of (a), (b), and (c) are problems each in their own right.
Alexandre, is this expected?
-Archie
___________________________________________________________________________
Archie Cobbs * Whistle Communications, Inc. * http://www.whistle.com
This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 19:57:38 EDT