Re: Multiple vendor branches

On 11/26/2013 02:57 PM, Lucas Holt wrote:
> I gave this a try this morning and I'm seeing the following errors:
> 
> ERROR: File '/home/cvs/src/contrib/one-true-awk/FIXES,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/awk.h,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/awkgram.y,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/lex.c,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/lib.c,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/makefile,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/maketab.c,v' has default branch=1.1.1 but also a revision 1.2
> ERROR: File '/home/cvs/src/contrib/one-true-awk/proctab.c,v' has default branch=1.1.1 but also a revision 1.2

This means that for those files, a revision 1.2 (and maybe later
revisions) were created on the file, which would usually switch the
default branch to 1.  But then somebody apparently switched the default
branch back to the vendor branch.  Since CVS doesn't record enough
information to know what contents those files should have had through
history, cvs2svn refuses to guess.

You probably want to either change the default branch for these files
back to 1, or delete ("obsolete") their revisions 1.2, 1.3, etc., based
on which one you think better reflects the file's real history.

Michael

-- 
Michael Haggerty
[email protected]
http://softwareswirl.blogspot.com/

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=3069288

To unsubscribe from this discussion, e-mail: [[email protected]].