RE: loosing branch when updating to a tag on the branch

[Jim.Hyslop]

todd breslow wrote:
> What is the correct practise here when you tag the state of your 
> working directory when working in a branch, update to that tag (let's 
> say to rollback a change) and want to check edits back in to the 
> branch? Is it possible to update -A -r <branch_name> and that 
> is how my 
> edits would get merged into the branch and then I check in and I am 
> good to go?
As Rohan says, a non-branch tag is a snapshot of a particular moment in
time. If you want to roll back to a particular snapshot, then make changes
to that snapshot, you need to create another branch from that snapshot. Use
the -r flag in tag to do this:

cvs tag -r test_tag_in_branch -b branch_off_of_test_tag
cvs update -r branch_off_of_test_tag

In general, try to avoid having too many branches active at the same time -
it can get very confusing and time-consuming to make sure that branches are
kept in sync - unless they're not supposed to be kept in sync, or if this
particular fix needs to be applied to branch A and branch C, but not to
branch B, and so on (get the idea? :=)

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)