Re: Vendor software update and branches

[Mark]

"Mark D. Baushke" said...
>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.

Ok.  It looks like this may work a little better.  But afterward it
looks like I will have to merge the vendors changes into my 'vendor
integration' branch (or vendor_update, as I called it previously).  It
looks like that branch, which was created before the new import, is
stuck to 1.1.1.1   This is still pretty painful.

It seems the real problem is that import wants to work on the main
trunk and no where else.

"Mark D. Baushke" said...
>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.

Well, if I did have 1.12.13, from the manual it sounds like this would
only help on new files.  Is that right?



Regards,
Mark