Discussion:
unknown
1970-01-01 00:00:00 UTC
Permalink
I have been creating branches with
# cvs tag dev_0-1-2_branch-root (in the dev sandbox)
# cvs rtag -r dev_0-1-2_branch-root -b www_1-0-1_branch www.example.com

Subsequently I've been tagging the branch from time to time thus,
incrementing n: "www_1-0-n_branch". But I'm now thinking that the
"www_1-0-1_branch" of the rtag command is the *branchname*, not a tag.

Therefore the command should be more like
# cvs rtag -r dev_0-1-2_branch-root -b branch_for_live_site www.example.com
I can then subsequently tag the branch as "www_1-0-n_branch".

So when I want to transfer changes made on the branch to the trunk I can use
(from within a trunk sandbox)
cvs update -j www_1-0-n_branch -j branch_for_live_site
where n is the number associated with the previous merge.

Is that correct, or am I still confused?

TIA

Roddie Grant

Loading...