[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: renaming branches
Derek R. Price
Re: renaming branches
Tue, 14 Aug 2001 09:51:24 -0400
"Cameron, Steve" wrote:
> Mark A. Turner (address@hidden) wrote:
> > cvs rtag -r 1.3.2 branch2 module_name
> This creates a non-branch (regular) tag. (the -b option is
> necessary to create a branch tag.) Also, it doesn't
> make sense to use a revision number with rtag (vs. tag)
> and a module_name (vs. a filename) Revision numbers apply
> to individual files, not modules, or sets of files.
Steve's mostly got it here, except that 1.3.2 is a valid way of refering to a
branch _IN A SINGLE FILE_. If you want to refer to a branch in multiple files
it's much easier to use a symbolic name.
Unfortunately the command Mark mentions still only creates a static tag
attached to 1.3.2.x, where 1.3.2.x is the revisionn on the tip of the 1.3.2
> (Also I find it weird that you have a revision number 1.3.2
> with only 3 components. Should have an even number...probably
> it's just a made up example.)
That's a carry over from RCS which CVS still supports. 1.3.2 is the numeric
"name" of the branch containing 1.3.2.x revisions - CVS would attach the tag to
> A thread I found via google says that "cvs admin"
> can do it, sort of, but I haven't tried it myself:
> From: Matthias Kranz (address@hidden):
> > On Thu, May 11, 2000 at 03:59:51PM -0300, Shane Turner wrote:
> > > The only way that I know of to rename a branch tag is using cvs admin.
> > >
> > > cvs admin -nbranch-name:new-branch-name
> > You should permute the tag names to
> > cvs admin -n<NEW_NAME>:<OLD_NAME>
> > > You'll need to have the files checked out unfortunately.
> > And you need also to remove the tag <OLD_NAME>, since otherwise you not
> > renamed but only added it.
> > cvs admin -n<OLD_NAME>
> > > I don't think that there is a way to rename the branch in any file
> > > that has been deleted on the branch.
> > Of course, that is a problem.
> > Regards,
> > Matthias
> So, choose (and type) your branch names carefully.
> Hope that helps.
> BTW, if somebody does know a reliable way to
> rename a branch tag, I'd like to hear it...
> (perhaps "cvs admin" can do it somehow.
cvs admin -n is the most reliable way I know. Matthias seems to have been
correct that it doesn't work on files not checked out in the cwd. Not even
when specified explicitly.
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden CollabNet ( http://collab.net )
"My father often told me,
We have servants and machines
in order that our will may be carried out
beyond the reach of our own arms.
Machines are more powerful than servants
and more obedient and less rebellious,
but machines have no judgement
and will not remonstrate with us
when our will is foolish,
and will not disobey us
when our will is evil.
In times and places where people despise the gods,
those most in need of servants have machines,
or choose servants who will behave like machines.
I believe this will continue
until the gods stop laughing."
-Orson Scott Card, "Children of the Mind"