CVS 3.1 branch inconsistency

[Geoff Keating]

Andi Kleen <ak@suse.de> writes:

> 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

That's not how you check out the branch.  That's how you merge the
differences between the mainline and the branch.  Since you didn't
start with the mainline, or anything that looks like the mainline,
naturally there are conflicts.

You want to use

cvs -d :pserver:anoncvs@gcc.gnu.org:/cvs/gcc co -r gcc-3_1-branch gcc

that is, '-r', not '-j'.

-- 
- Geoffrey Keating <geoffk@geoffk.org> <geoffk@redhat.com>