Re: CVS import branching question

[Kaz Kylheku]

In article <address@hidden>, Chalmers, Tim wrote:
>I am experiencing some weirdness that I do not understand.  I am issuing the
>following commands:
>
>cvs import -m InititalRelease GyLocation VenderTag ReleaseTag  
>cvs checkout  filename
>cvs status filename 
>
>
>The output looks like:
>
>File: gybtmfw_GyTaskController_setStatus_313.qpp        Status: Up-to-date
>
>   Working revision:    1.1.1.1 Thu Oct 11 00:16:34 2001
>   Repository revision: 1.1.1.1
>/export/home/gy45044/CVSROOT/GyLocation/gybtmfw_GyTaskController_setStatus_3
>13.qpp,v
>   Sticky Tag:          (none)
>   Sticky Date:         (none)
>   Sticky Options:      (none)
>
>
>The question is, when I performed the checkout, why am I on the vender or
>Release branch?

You're not. The reason you have file 1.1.1.1 is because that is the 
head revision of the file. This is an internal notion within CVS that
you don't need to worry about.

Basically, if you import a file on a vendor branch, and the corresponding
file is not independently modified on the trunk, the new vendor branch 
version supersedes the trunk by becoming the new head.  If you make
a change and commit, it will go to the trunk.

E.g. in this case, the next version you commit will create version 1.2,
not 1.1.1.2.

If you were on the vendor branch, you would have a sticky tag indicating so.