[cvsnt] Re: Renaming Branch Tags

David Hauck davidh at netacquire.com
Thu Mar 3 16:51:46 GMT 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Hi Tony,

> David Hauck wrote:
> > Hi,
> >
> > 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.
>
> something like:
>
> cvs rtag -A -r V1_1_BRANCH V1_1_BRANCH_OLD mymodule

I don't see what I would expect after executing this step. For e.g., file
"x" has the following tags now:

V1_1_BRANCH_OLD: 1.81.4.2
...
V1_1_BRANCH: 1.81.0.4
...

Perhaps I have a misinterpretation of the term "branch tag". I refer to
V1_1_BRANCH as a "branch tag" and would like V1_1_BRANCH_OLD to be the same
(i.e., indicating use of the "magic" branch number). Perhaps it is not
possible to have the following (or perhaps alias tags just don't work like
this):

V1_1_BRANCH_OLD: 1.81.0.4
V1_1_BRANCH: 1.81.0.4

Or perhaps CVSNT maintains extra information somewhere such that after
executing the line you follow with (i.e., *deleting* the original branch
tag) the new alias assumes the old tag's value (i.e., V1_1_BRANCH_OLD now
becomes 1.81.0.4)?

Ideally (even before creating the new branch that I'd like to (re)use the
original branch tag for) I'd like to use the V1_1_BRANCH_OLD tag to perform
heritage operations, like:

cvs co -r V1_1_BRANCH_OLD -d v11-original mymodule

to obtain the tip of the old branch.

Does this make sense?

Thanks again for any help in advance.

-David

> 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
>
> Tony
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook