Re: Multiple vendor branches

On Nov 26, 2013, at 2:33 AM, Michael Haggerty <[email protected]> wrote:

>=20
> 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'.
>=20
> 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.
>=20
> 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
>=20
>    RegexpSymbolTransform(r'X', r'Y')
>=20

Thanks for your response Michael. =20

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=
=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/awk.h,v' has default branch=
=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/awkgram.y,v' has default br=
anch=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/lex.c,v' has default branch=
=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/lib.c,v' has default branch=
=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/makefile,v' has default bra=
nch=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/maketab.c,v' has default br=
anch=3D1.1.1 but also a revision 1.2
ERROR: File '/home/cvs/src/contrib/one-true-awk/proctab.c,v' has default br=
anch=3D1.1.1 but also a revision 1.2

Lucas Holt

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=3D1670&dsMessageId=3D=
3069282

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