Re: Branch removal and nested branches

[Donald Sharp]

On Thu, Jul 19, 2001 at 07:21:48PM +0100, Lars Hecking wrote:
> 
> > >  what happens to branch Second if branch First is collapsed into the
> > >  main trunk? Does it get rooted at the main trunk revision where the
> > 
> > By collapsing, I assume you mean changes merged down?
>  
>  I meant merging and then removing branch First. But then I realised that
>  there is no command to actually remove a branch. Unless tag -d works
>  with branch tags (does it?).

While technically you can remove a branch(name) with the -d option.  You
are going to buy yourself a lot of trouble by doing that.  Especially
in this situation you are talking about..  

Also, Removing the branch with tag -d doesn't really remove the data,
it only removes the branch name from the symbols section of the
,v file.  You can put yourself in situations where you create
a new branch( and it reuses the old branch number ), and
then all of a sudden that new branch has a lot of versions on it.

> 
>  Or is it just better to tell everyone that a certain branch is dead?

Tell everyone the branch is dead.  please ;)

> 
> > Their is no mechanism in cvs to allow branch reparenting, although
> > with carefull placement of merge labels, you should be able
> > to continue merges onto the second branch.
> 
>  Yeah, I find this quite important.

Yep, lay labels.  You should be able to merge properly.

donald

> 
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs