Re: Problem with branching

[John Carter]

On Mon, 17 May 2004, Fouts Christopher () wrote:

> I have a development branch, b_dev.
> I create a branch off this branch, called b_dev_user1
>
>       > cvs rtag -r b_dev -b b_dev_user1 proj/dir1
>
> But when I look at the proj/dir1 tree on tkCVS, I see that b_dev_user1 is
> off the TRUNK
> and NOT off b_dev as expected. What gives?

My guess is either tkcvs or user error.

Choose a file in proj/dir1 and look at "cvs log"

>From the Branches and Revisions page of the cvs reference manual...

All revisions on a branch have revision numbers formed by appending
an ordinal number to the branch number.  The following figure
illustrates branching with an example.

                                                           +-------------+
                                Branch 1.2.2.3.2 ->        ! 1.2.2.3.2.1 !
                                                         / +-------------+
                                                        /
                                                       /
                      +---------+    +---------+    +---------+
     Branch 1.2.2 -> _! 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
     +-----+    +-----+    +-----+    +-----+    +-----+
                     !
                     !
                     !   +---------+    +---------+    +---------+
     Branch 1.2.4 -> +---! 1.2.4.1 !----! 1.2.4.2 !----! 1.2.4.3 !
                         +---------+    +---------+    +---------+





John Carter                             Phone : (64)(3) 358 6639
Tait Electronics                        Fax   : (64)(3) 359 4632
PO Box 1645 Christchurch                Email : address@hidden
New Zealand

The universe is absolutely plastered with the dashed lines exactly one
space long.