[cvsnt] Re: Renaming Branch Tags
tmh at nodomain.org
Thu Mar 3 01:38:07 GMT 2005
David Hauck wrote:
> I have a desire to rename a branch tag. I realize it's easy/straightforward
> to rename fixed tags, but was wondering if the same thing was true for
> branch tags. I suspect not. Is this something that CVSNT can do?
> For example:
> 1. Develop on the trunk (v1.0).
> 2. Branch for speculative v1.1 effort (use V1_1_BRANCH as the branch tag).
> 3. Stop branch development, merge v1.1 into the trunk.
> 4. Continue v1.1 effort on the trunk.
> 5. Release v1.1 and branch (ideally using V1_1_BRANCH as the branch tag) for
> ongoing v1.1 patch releases.
> I'd like the v1.1 patch release to occur on a branch with tag V1_1_BRANCH.
> Unfortunately the original (speculative) branch (step 2) used this name.
> Ideally I'd like to rename the original branch something like
> V1_1_BRANCH_OLD (or some such), prior to step 5 so that I might create the
> new branch with the name V1_1_BRANCH.
cvsnt can do that with alias tags... it sounds like your going about it
in a more complex way than necessary though.
cvs rtag -A -r V1_1_BRANCH V1_1_BRANCH_OLD mymodule
cvs rtag -B -d V1_1_BRANCH mymodule
then retag the new code with V1_1_BRANCH.
The easier way would just be to have a floating alias tag. If you're
changing development streams a lot, have a single alias tag
CURRENT_BRANCH that points to V1_1_BRANCH initially, then
V1_1_BRANCH_NEW etc. and everyone knows that a checkout of
CURRENT_BRANCH will always get the right code.
To retarget an alias tag you'd do something like:
cvs rtag -A -F -B -r V1_1_BRANCH CURRENT_BRANCH mymodule
More information about the cvsnt