info-cvs
[Top][All Lists]
Advanced

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

RE: Problem with branching


From: Fouts Christopher ()
Subject: RE: Problem with branching
Date: Tue, 18 May 2004 09:53:18 -0400

Ok, looking at the RCS fils, I see the problem. 

Here's the RCS info of one file that shows CORRECT branching...

head    1.5;
access;
symbols
        b_dev_01_02_cf:1.5.2.1.0.2
        b_dev_01_02:1.5.0.2;
locks; strict;
comment @# @;


1.5
date    2004.05.14.20.58.43;    author chris;   state Exp;
branches
        1.5.2.1;
next    1.4;

(snip other RCS info)

desc
@@
<file starts here>


And here's the RCS info of a file that show the WRONG branching...

head    1.5;
access;
symbols
        b_dev_01_02_jg:1.5.0.6
        b_dev_01_02_cf:1.5.0.4
        b_dev_01_02:1.5.0.2;
locks; strict;
comment @ * @;


1.5
date    2004.05.14.20.57.01;    author chris;   state Exp;
branches;
next    1.4;

(snip other RCS info)

desc
@@
<file starts here>

Notice "branches" line in the second file is missing the branch
revision info, and hence the symbol revisions are wrong. I don't
know how it got this way. How do I correct this with "cvs admin"? 
If I edit the *,v file itself, I get an "unexpected EOF encountered"
error when I do a checkout of the branch.

-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf
Of John Carter
Sent: Monday, May 17, 2004 10:02 PM
To: address@hidden
Subject: Re: Problem with branching


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.


_______________________________________________
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]