This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
CVS 3.1 branch inconsistency
- From: Andi Kleen <ak at suse dot de>
- To: gcc-bugs at gcc dot gnu dot org
- Date: Sat, 4 May 2002 13:42:03 +0200
- Subject: CVS 3.1 branch inconsistency
When I try to checkout the gcc 3.1 branch into an empty directory I get lots
of conflicts during the merge into the branch. HEAD it works fine.
% cvs -d :pserver:anoncvs@gcc.gnu.org:/cvs/gcc -z3 check
out -j gcc-3_1-branch gcc
cvs server: Updating gcc
U gcc/.cvsignore
U gcc/COPYING
U gcc/COPYING.LIB
U gcc/ChangeLog
RCS file: /cvs/gcc/gcc/ChangeLog,v
retrieving revision 1.467
retrieving revision 1.467.2.22
Merging differences between 1.467 and 1.467.2.22 into ChangeLog
rcsmerge: warning: conflicts during merge
and the conflicts repeat for lots of other files.
Any ideas? I'm using CVS 1.11p1. It seems to occur on both gcc.gnu.org
and subversions.gnu.org
-Andi