info-cvs
[Top][All Lists]
Advanced

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

Branch removal and nested branches


From: Lars Hecking
Subject: Branch removal and nested branches
Date: Thu, 19 Jul 2001 18:21:04 +0100
User-agent: Mutt/1.3.19i

 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
 merge happens? And what about the branch history?

 Thanks for any insights.




reply via email to

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