[Cvsnt] Re: branching and tags

[Terris]

I create a new tag after every build.  A unique tag based on the time the build started.  When we get close to releasing we create a branch i.e. "Q5_0" but we continue to tag even in the branch.  When there is a branch, changes that go into the branch usually go into the trunk.  This either occurs manually (which is the usual way) or via CVS (which is rare).

Generally if somebody wants to get code they either use a branch tag or they don't specify a tag (i.e. get the trunk).  The build tags exist for emergencies only.

We use my build tools at http://devguy.com/pctk to build on the branch and also on the trunk.  It also does the tagging for us and a bunch of other stuff.

>>> Can you perform a get from a Tag and then turn around and create a new Tag based on the files you picked up off the Tag you originally used?

Yes, you can.  The "cvs tag" command only works on the revisions you have checked out of CVS.  This is a brilliant feature of CVS.  Therefore you can "checkout" using a tag, modify a file, check it in, and then create a new tag that contains the revisions in the previous tag plus the additional change.

---- Original message ----

There are a few questions I couldn't find in the CVS manual and I was
wondering if someone on this list might be able to assist me. Our
Configuration Management group just recently picked up a group of developers
who use CVS and it's put me in a bit of a bind since none of our team
members have experience with CVS.

1.) In regards to version control would it make more sense to do which of
the following (1a or 1b), or something not mentioned (1c??)?
1a.) Have a build tag that the build environment builds from (e.g. a tag
named "Version200Beta1") while the development team continues to make
changes in the Main Trunk and then move the "Version200Beta1" tag forward
when the developers have stabilized their code?
1b.) Have the development team work from a development branch (and possibly
Feature branches) where they can merge changes back into the Main Trunk and
the build environment will pull from the tip of the Main Trunk?

2.) Can you perform a get from a Tag and then turn around and create a new
Tag based on the files you picked up off the Tag you originally used?
Example: Your build system pulls from the "Version200Beta1" tag and you wish
to create a new tag named "SCN_ENU_BLD166" and apply that to the files your
build system is currently using (which was from the "Version200Beta1" tag).
It seemed like this was possible since the tag is based off the files you
have locally, correct?

Any assistance or documentation you could provide would be appreciated.

Best regards,
Jeremy Holz
Network Associates
Configuration Management
Mail: jholz at nai.com

_______________________________________________
Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt