info-cvs
[Top][All Lists]
Advanced

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

branch checkin question


From: yozhang
Subject: branch checkin question
Date: 15 Nov 2005 16:08:53 -0800
User-agent: G2/0.2

Hi,

I can not make my branch check in work correctly with rtag.

I has a module called sample with has four files:
sample/Makefile
sample/f1.c
sample/foo.c
sample/main.c.

Under directory: /home/yzhang/Test_CVS, I checked out them using: cvs
co sample, and I got /home/yzhang/Test_CVS/sample.

Then I copy f1.c to f2.c to get a new file. added it with "cvs add
f2.c" in sample directory. Then I run the following to check in:

cd /home/yzhang/Test_CVS; cvs rtag -b A1_yzhang_before sample
cd /home/yzhang/Test_CVS/sample; cvs update -r A1_yzhang_before
cd /home/yzhang/Test_CVS; cvs commit -m "dd"  sample/f2.c
cd /home/yzhang/Test_CVS; cvs rtag -b A1_yzhang_after sample.

After that, I check with cvs status

address@hidden sample]$ cvs status -v Makefile
===================================================================
File: Makefile          Status: Up-to-date

   Working revision:    1.1.1.1 Tue Nov 15 23:19:53 2005
   Repository revision: 1.1.1.1
/home/yzhang/Test_CVS/cvsroot/sample/Makefile,v
   Sticky Tag:          A1_yzhang_before (branch: 1.1.1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        A1_yzhang_after                 (branch: 1.1.1.1.4)
        A1_yzhang_before                (branch: 1.1.1.1.2)
        R0                              (revision: 1.1.1.1)
        a1                              (branch: 1.1.1)


Now I started another telnet windows to go to a different directory,
and do the checkout. I find that

 "cvs co sample" always give me the latest changes. ie. I can get f2.c
with it. same as co with A1_yzhang_after tag.

Anything I missed?  Shouldn't its output be same as co with R0 tag? Do
I must need to apply the branch tag before I make any source code
change? I want my change to be put into a branch instead of the trunk.

Thanks!

Yonf



reply via email to

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