Re: Multiple vendor branches

On 11/26/2013 02:02 AM, Lucas Holt wrote:
> 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 don't believe that this error can come from importing twice.  AFAIK
each time you import you would create a new vendor branch; e.g. 1.1.1,
1.1.3, etc. (the last number is always odd for vendor branches), and
each vendor branch would get its own symbolic name.  The situation you
are experiencing is that you have only one vendor branch, 1.1.1, and it
somehow has two symbolic names, 'X' and 'Y'.

If you tell cvs2svn just to ignore the unwanted symbol name, then the
conversion should go through without complaints.  To do this, you need
to start cvs2svn via the options-file method and then use a
IgnoreSymbolTransform.  See cvs2svn-example.options for documentation.

If you want to be super-careful, you might first want to verify that the
symbol name that you are ignoring is really redundant in every file.
Or, I think it would also work to transform the unwanted symbol name
into the wanted symbol name, because cvs2svn ignores symbols that appear
twice with the *same* value.  This would require something like

    RegexpSymbolTransform(r'X', r'Y')

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

Feel free to add a copy of my answer there so that the Internet gets a
feeling of closure :-)

Michael

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

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

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