info-cvs
[Top][All Lists]
Advanced

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

Re: loosing branch when updating to a tag on the branch


From: Rohan Nandode
Subject: Re: loosing branch when updating to a tag on the branch
Date: Fri, 23 Jul 2004 20:20:40 +0530
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020830


[g5/production/codebase] breslow% cvs status robots.txt
===================================================================
File: robots.txt        Status: Up-to-date

   Working revision:    1.3
Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v
   Sticky Tag:          release_5_branch (branch: 1.3.4)
   Sticky Date:         (none)
   Sticky Options:      (none)

[g5/production/codebase] breslow% cvs tag test_tag_in_branch
[g5/production/codebase] breslow% cvs up -r test_tag_in_branch
[g5/production/codebase] breslow% cvs status robots.txt
===================================================================
File: robots.txt        Status: Up-to-date

   Working revision:    1.3
Repository revision: 1.3 /usr/home/giro1150/cvsroot/codebase/robots.txt,v
   Sticky Tag:          test_tag_in_branch (revision: 1.3)
   Sticky Date:         (none)
   Sticky Options:      (none)


Your branch is not lost, cvs just updated the file from branch to one particular tag, whhich happens to be on trunk.

This is because robots.txt is same for both trunk and branch( see its version is 1.3 for both). if you check in this file into the branch, its version will be increamented for branch and then cvs update on branch will give you the branch version.

There is one more thing that tags are not associated with branches but its associated with versions. i.e. if you tag branch code, cvs wouldn't store that tag is for branch code. so when you update for that tag, it just takes out particular version of all files tagged with the tag. So you will never get, something like this, when you update on sticky tag. i.e no (brach:version) in "Sticky Tag"

> /usr/home/giro1150/cvsroot/codebase/robots.txt,v
>    Sticky Tag:          test_tag_in_branch ( branch: <whatever_ver>)
>    Sticky Date:         (none)
>    Sticky Options:      (none)







reply via email to

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