Re: Vendor software update and branches

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark <address@hidden> writes:

> I've been doing more testing and see that by useing the -b 1.1.2
> argument for my new import, the new vendor code is not generally seen
> on the main trunk.  Main continues to look at 1.1.1 and I can deal with
> the merges in another branch.   (exactly what I need)

This is a really bad idea. The 1.1.2 you specified will be the same
branch as a 1.1.0.2 cvs magic branch would have been if you had
created a normal 'cvs tag -b' on your sources.

Generally, the property of a vendor branch is that it must be an odd
number of digits and the final digit should be an odd number.
For example, '-b 1.1.3' is okay.

> After the import I get a message suggesting that I run "cvs co -jTAG
> -jTAG" and check in.  However I see that this is just merging the code
> into the main trunk, so I believe I can hold off on that.

Sure.

> The last problem I can see at this point is that new files from the new
> import immediately show up on the main trunk (probably because there is
> no 1.1.1, so it defaults to viewing  1.1.2).

No, this is function of the default way in which a cvs import is
supposed to work.

> I believe, this is why you suggested using cvs version 1.12.13 'cvs
> import -X'.

Yes, the -X switch will change the default.

You may also be interested in a script that Chris Demetriou posted
which the folks at NetBSD were using for a while until the import -X
switch was adopted. Go to this URL:

  http://lists.gnu.org/archive/html/bug-cvs/2004-06/msg00173.html

and take a look at the cvsimport_killnew attachment script for a way to
do this kind of thing using cvs 1.11.x if that makes you feel better.

> But how risky is it to upgrade from 1.11 to 1.12 ??

I believe the risk is low.
(Even cvs.savannah.gnu.org is using a 1.12.x release.)

We are using cvs 1.12.x in production at my place of employment with
some fairly large and active cvs repositories.

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFDzh8QCg7APGsDnFERAskWAJ4ysBmK+3hGkx/IP0zfp1F500Lf/wCfaNRh
W/nDI8H5ljcToo2kubbot+E=
=mazH
-----END PGP SIGNATURE-----