info-cvs
[Top][All Lists]
Advanced

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

Re: Is it possible to change a branch tag name?


From: Dale Miller
Subject: Re: Is it possible to change a branch tag name?
Date: Wed, 06 Dec 2000 11:06:02 -0600

John,

After I made the change in my example below, I went back to work
with the file and in my work area I now get

 cvs server: conflict: SDHSU/isreplace/ids/Make.defs is modified but no longer in the repository
 C SDHSU/isreplace/ids/Make.defs

when doing a "cvs update" on the file.

Warning: you would not want to rename the branch tag if people have the
file in their work area with the old tag name.  The CVS/Entries will include
the old tag name and now you have something else to correct.

Dale

Dale Miller wrote:

John,

To rename an existing tag (not a branch tag) you should be able to:

cvs rtag -r existing_tag new_tag module
cvs rtag -d existing_tag module

However, this does not work with a branch tag unless you use
the -r number instead of name.

Since each file in a branch tag would have different branch numbers
you would have to do this on each file separately.  You could automate
the process but you would have to examine the output of the status -v
command for each file parsing the Existing Tag information to get the
branch number.

The following is an example with some test data.  This example renames the
SCR20000600b (branch tag) and SCR20000600 (revision tag) to
SCR20000601b and SCR20000601.

Example:
cvs status -v SDHSU/isreplace/ids/Make.defs
===================================================================
File: Make.defs         Status: Up-to-date

   Working revision:    1.9
   Repository revision: 1.9     /sdhs_mnt2/cvsroot/SDHSU/isreplace/ids/Make.defs,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        SCR20000600                     (revision: 1.9.6.1)
        SCR20000600b                    (branch: 1.9.6)
        SCR19981615                     (revision: 1.9.4.1)
        SCR19981615b                    (branch: 1.9.4)
        SCR20000507                     (revision: 1.9.2.1)
        SCR20000507b                    (branch: 1.9.2)

cvs rtag -r SCR20000600b SCR20000601b SDHSU/isreplace/ids/Make.defs    <-- gives incorrect result
cvs status -v SDHSU/isreplace/ids/Make.defs
===================================================================
File: Make.defs         Status: Up-to-date

   Working revision:    1.9
   Repository revision: 1.9     /sdhs_mnt2/cvsroot/SDHSU/isreplace/ids/Make.defs,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        SCR20000601b                    (revision: 1.9.6.1)       <-- note the Tag is to the revision and not the branch
        SCR20000600                     (revision: 1.9.6.1)
        SCR20000600b                    (branch: 1.9.6)
        SCR19981615                     (revision: 1.9.4.1)
        SCR19981615b                    (branch: 1.9.4)
        SCR20000507                     (revision: 1.9.2.1)
        SCR20000507b                    (branch: 1.9.2)

cvs rtag -r 1.9.6 SCR20000601b SDHSU/isreplace/ids/Make.defs   <-- gives desired result
cvs status -v SDHSU/isreplace/ids/Make.defs
===================================================================
File: Make.defs         Status: Up-to-date

   Working revision:    1.9
   Repository revision: 1.9     /sdhs_mnt2/cvsroot/SDHSU/isreplace/ids/Make.defs,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        SCR20000601b                    (branch: 1.9.6)    <-- now it is on the branch
        SCR20000600                     (revision: 1.9.6.1)
        SCR20000600b                    (branch: 1.9.6)
        SCR19981615                     (revision: 1.9.4.1)
        SCR19981615b                    (branch: 1.9.4)
        SCR20000507                     (revision: 1.9.2.1)
        SCR20000507b                    (branch: 1.9.2)

cvs rtag -d SCR20000600b SDHSU/isreplace/ids/Make.defs
cvs status -v SDHSU/isreplace/ids/Make.defs
===================================================================
File: Make.defs         Status: Up-to-date

   Working revision:    1.9
   Repository revision: 1.9     /sdhs_mnt2/cvsroot/SDHSU/isreplace/ids/Make.defs,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        SCR20000601b                    (branch: 1.9.6)
        SCR20000600                     (revision: 1.9.6.1)
        SCR19981615                     (revision: 1.9.4.1)
        SCR19981615b                    (branch: 1.9.4)
        SCR20000507                     (revision: 1.9.2.1)
        SCR20000507b                    (branch: 1.9.2)

cvs rtag -r SCR20000600 SCR20000601 SDHSU/isreplace/ids/Make.defs
cvs rtag -d SCR20000600b SDHSU/isreplace/ids/Make.defs
cvs status -v SDHSU/isreplace/ids/Make.defs
===================================================================
File: Make.defs         Status: Up-to-date

   Working revision:    1.9
   Repository revision: 1.9     /sdhs_mnt2/cvsroot/SDHSU/isreplace/ids/Make.defs,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        SCR20000601                     (revision: 1.9.6.1)
        SCR20000601b                    (branch: 1.9.6)
        SCR19981615                     (revision: 1.9.4.1)
        SCR19981615b                    (branch: 1.9.4)
        SCR20000507                     (revision: 1.9.2.1)
        SCR20000507b                    (branch: 1.9.2)

Dale Miller
 

"John R. Dunning" wrote:

One of the folks in my group has decided he wants to change the name
of a branch tag, after having done some amount of changing of files on
that branch.  I'd never heard of a way to do that, and a scan of the
docs doesn't reveal anything that looks like a facility for doing
that, but I figured it was worth asking the list:  Is there a way to
change the name of an existing branch tag?

Thanks in advance...

_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs

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