Re: Vendor software update and branches

[Mark D. Baushke]

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

Mark <address@hidden> writes:

> I've been reading the manual and doing some testing but can't come up
> with a procedure for the following.
> 
> We have 3rd party software and a vendor has givin us a new version.  We
> will be working on integrating this new version into our code base, but
> at the same time can not change the main trunk until we are ready.
> 
> The inital vendor software was imported on a vendor branch.
> 
> I have set up a test where I cvs import a directory into a test
> repository.  Then I create a workspace, called sandbox 1, check out the
> code, and commit a few modifications.
> 
> Then I change the 'vendor source' and cvs import again using a new
> release tag.  At that point, cvs update in sandbox 1 wants to extract
> the new versions (except where I made changes), but I need to keep the
> main trunk (HEAD) in tact with the vendor code it has always been
> using.
> 
> The only way I can see to do this is
> -Create a new branch, called vendor_update
> -Check out vendor_update
> -copy in the new vendor drop, manually removing elements accordingly
> -Check into vendor_update
> 
> The problem with this is we are not able to easily diff the vendor
> releases.
> 
> What is the best way to get the proper outcome?
> 
> Regards,
> Mark

You may wish to do a forced commit of all the files on your mainline
which happen to have 1.x.1.y vendor version numbering so that any import
you do to the vendor branch would need to be merged into the mainline
and committed separately.

If you are using cvs 1.12.13, then the 'cvs import -X' option will
automatically create the versions 1.1 (initial version) and 1.1.1.1
(vendor branch) and 1.2 (main trunk) with the 1.2 version being 'dead'
and so not visible on the main trunk.

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

iD8DBQFDzEx/Cg7APGsDnFERAoWrAKCfu0gqMq8YLC2yBK80EOoi41niGACgtXGT
bE5ZoASShg2QGCbe5r2fulE=
=064I
-----END PGP SIGNATURE-----