info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Branch removal and nested branches


From: Donald Sharp
Subject: Re: Branch removal and nested branches
Date: Thu, 19 Jul 2001 13:58:43 -0400
User-agent: Mutt/1.2.4i

On Thu, Jul 19, 2001 at 06:21:04PM +0100, Lars Hecking wrote:
> 
>  Given something like the following scenario,
> 
>                                                            +-------------+
>                                 Branch Second    ->        ! 1.2.2.3.2.1 !
>                                                          / +-------------+
>                                                         /
>                                                        /
>                       +---------+    +---------+    +---------+
>      Branch First -> _! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 !
>                     / +---------+    +---------+    +---------+
>                    /
>                   /
>      +-----+    +-----+    +-----+    +-----+    +-----+
>      ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !  <- The main trunk
>      +-----+    +-----+    +-----+    +-----+    +-----+
> 
>  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?

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.

donald
>  merge happens? And what about the branch history?
> 
>  Thanks for any insights.
> 
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]