Multiple vendor branches

I made the mistake of importing code under two vendor branches into my CVS repository several years ago.  I'm now trying to use cvs2svn to migrate to SVN. 

While running cvs2svn, I get errors such as:

WARNING: in '/home/cvs/src/contrib/one-true-awk/FILES,v': branch '1.1.1' already has name 'Y', cannot also have name 'X', ignoring the latter

I assume that I need to fix the CVS repository prior to running cvs2svn to work around this problem.  However, I don't know the best approach to clean up the mess.  I don't care about the history of the second vendor branch, but I don't want to disrupt the files that were committed this way that are now on HEAD and release branches.

I've also posted this on stack overflow here:
http://stackoverflow.com/questions/20164603/how-do-i-clean-up-cvs-vendor-branch-imports

I'm using cvs2svn 2.4.0 on MidnightBSD with python 2.6.8.   


Lucas Holt
[email protected]
________________________________________________________
MidnightBSD.org (Free OS)
JustJournal.com (Free blogging)

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

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