[Top][All Lists]

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

Re: Problems branching in CVS

From: Larry Jones
Subject: Re: Problems branching in CVS
Date: Thu, 5 Jul 2001 16:58:20 -0400 (EDT)

berry writes:
> I have the version I want to branch from checked out
> in my directory berry/src/scripts/esproc/clip
> Now I create a "sticky tag" to branch from.
> cato:/users/721/berry/src/scripts/esproc/clip% cvs tag -b daves_takeoff_point

That's a branch tag.  "Stickiness" isn't a property of a tag, it's a
property of the way the tag is used.

> Now I need to check out the source with this "sticky tag"
> cato:/users/721/berry/src/scripts% cvs co -r daves_takeoff_point esproc/clip
> cvs checkout: Updating esproc/clip

Since it's already checked out, you're not really doing a checkout,
you're doing an update the hard way.  Instead of changing to the parent
directory, doing a checkout, and then changing back, just do update in
the working directory:

 cato:/users/721/berry/src/scripts/esproc/clip% cvs update -r 

> Now I make changes to all files in the source set
> and try to check in the branch.

So far, so good.

> Now I check out the branched version just created:

That's where you're going wrong.  You've already *got* the branched
version, you don't need to do *anything* at this point.

> cato:/users/721/berry/src/scripts% cvs co -r esproc/clip

That checks out a specific revision, not the branch.  In general, the
files at the head of the branch will *not* all have the same numeric
revision.  To check out the most recent revisions on the branch, you
would just use the branch tag (e.g., -r daves_takeoff_point).  In a
working directory that's already on the branch (like yours is), you just
use a plain update with no specific revision (that's why it's called a
"sticky" tag -- it sticks and CVS remembers it so that you don't have to
keep specifying it all the time).  The directory you just committed is
already up to date so, as I said above, you don't have to do anything at
all; just go ahead and make more changes and commit them.

-Larry Jones

I keep forgetting that rules are only for little nice people. -- Calvin

reply via email to

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