Branching bug ??? (was Re: Bug is tagging the head of a branch head???)

[Christopher.Fouts]

I thought I was all straigt on this so I ran an experiment.
Again I have v1.11.14...

I have a sample project and I did the following...
        > cvs rtag -r HEAD -b b_dev_01_03 sample

...to create the b_dev_01_03 branch off the trunk correct?
And...
        > cvs rtag -r b_dev_01_03 -b b_dev_01_03_cf sample

...to create the b_dev_01_03_cf branch off the b_dev_01_03 branch
correct?

I checked out the b_dev_01_03 branch, modified one file, and checked it
in. I get...
        > cvs status -v file1

===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.6.4.1
   Repository revision: 1.6.4.1 /cvsroot/sample/dir1/file1,v
   Sticky Tag:          b_dev_01_03 (branch: 1.6.4)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        b_dev_01_03_cf                  (branch: 1.6.6)
        b_dev_01_03                     (branch: 1.6.4)
        t_pre_dev_01_02_xx              (revision: 1.6)
        b_dev_01_02                     (branch: 1.6.2)
        t_pre_dev_01_02                 (revision: 1.6)

I checked out the b_dev_01_03_cf branch, modified one file, and checked
it
in. I get...
        > cvs status -v file1

File: file1             Status: Up-to-date

   Working revision:    1.6.6.2
   Repository revision: 1.6.6.2 /cvsroot/sample/dir1/file1,v
   Sticky Tag:          b_dev_01_03_cf (branch: 1.6.6)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        b_dev_01_03_cf                  (branch: 1.6.6)
        b_dev_01_03                     (branch: 1.6.4)
        t_pre_dev_01_02_xx              (revision: 1.6)
        b_dev_01_02                     (branch: 1.6.2)
        t_pre_dev_01_02                 (revision: 1.6)

Do you see how the b_dev_01_03_cf branch is NOT off the b_dev_01_03,
even though I've files checked in in both branches and hence defeating
the "optimization" that Larry pointed out? Of course tkCVS shows that
BOTH b_dev_01_03 and b_dev_01_03_cf are off the trunk.

So I ask again, is this a bug in v1.11.14, or is it user error. If 
user error, how can I achieve my desired results, where b_dev_01_03
is off the trunk, and b_dev_01_03_cf branch off b_dev_01_03 branch?

-chris

-----Original Message-----
From: Larry Jones [mailto:address@hidden 
Sent: Wednesday, May 19, 2004 12:52 AM
To: Fouts Christopher ()
Cc: 'address@hidden'
Subject: Re: Bug is tagging the head of a branch head???


"Fouts Christopher ()" writes:
> 
> If I want to tag the head of a newly created branch (with no work 
> committed to it yet), I just do a
> 
>       > cvs rtag -r b_dev_01_02 t_pre_dev_01_02_xx sample
> 
> correct?

Correct.

> Now when I do a checkout of the tagged files,
...
> and do a cvs status -v on one of the files, it shows the tag sticking 
> to the HEAD revision, NOT the branch head revision.

Also correct.

> Is this a bug???

No, it's an optimization.  CVS doesn't really create a branch in the RCS
file until you commit changes on the branch.  So, until you actually
commit changes on the branch, the head of the branch is the revision you
branched from.

-Larry Jones

Mom must've put my cape in the wrong drawer. -- Calvin