Hi,

I have read the recent messages regarding branch locking in CVS. I tried to
do a similar thing myself, and I get strange output from CVS, which I cannot
understand even after reading these messages. Here are the commands that I
gave and the output of CVS for these commands:
(I typed these commands from inside a working directory of some CVS project
that I created to test branch locking. This project contains a single file,
"hello.c".)

> cvs tag Root_of_Second-Branch
cvs tag: Tagging .
T hello.c
> cvs tag -b Second-Branch
cvs tag: Tagging .
T hello.c
> cvs admin -lSecond-Branch
cvs admin: Administrating .
RCS file: [path-to-project]/hello.c,v
cvs admin: [path-to-project]/hello.c,v: branch Second-Branch absent
cvs admin: cannot modify RCS file for `hello.c'

(I replaced the long path to the project repository by with
[path-to-project].)

What is the problem here? I clearly created a branch in the second command
that I gave, and CVS shows that "hello.c" was tagged with the branch tag. If
I now do "cvs log", I see the symbolic name Second-Branch for "hello.c". I
can also update to the branch tag. Here's CVS output for these commands:

> cvs log hello.c
RCS file: [path-to-project]/hello.c,v
Working file: hello.c
head: 1.2
branch:
locks: strict
access list:
symbolic names:
        Second-Branch: 1.2.0.2
        Root_of_Second-Branch: 1.2
        First-Branch: 1.1.1.1.0.2
        Root_of_First-Branch: 1.1.1.1
        start: 1.1.1.1
        yoyo: 1.1.1
keyword substitution: kv
total revisions: 5;     selected revisions: 5
description:
......
> cvs update -rSecond-Branch
cvs update: Updating .
> cvs status hello.c 
===================================================================
File: hello.c           Status: Up-to-date

   Working revision:    1.2     Wed Jul 19 11:37:44 2000
   Repository revision: 1.2     [path-to-project]/hello.c,v
   Sticky Tag:          Second-Branch (branch: 1.2.2)
   Sticky Date:         (none)
   Sticky Options:      (none)


Is it a problem that "cvs status" shows me a version number of 1.2.2 for the
branch, while "cvs log" shows me version 1.2.0.2 for the branch of
"hello.c"?

Thanks,
Shlomo

Reply via email to