Re: Problems branching in CVS

[berry]

Larry,

Thanks for the advice! I tried the following and this worked:

cato:/users/721/berry/src/scripts/esproc% rm -r clip
cato:/users/721/berry/src/scripts/esproc% cd ..

ato:/users/721/berry/src/scripts% cvs co -r daves_takeoff_point esproc/clip
cvs checkout: Updating esproc/clip
U esproc/clip/clip.c
U esproc/clip/clip.h
U esproc/clip/clip.nsd
U esproc/clip/makefile
cato:/users/721/berry/src/scripts% cd esproc/clip
cato:/users/721/berry/src/scripts/esproc/clip% cvs status -v
cvs status: Examining .
===================================================================
File: clip.c            Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:26 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.c,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                             R170                            
(revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

===================================================================
File: clip.h            Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:28 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.h,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                            (revision: 200.10)
        R170                            (revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

===================================================================
     

Made mods to all files and commit:
cato:/users/721/berry/src/scripts% cvs commit esproc/clip
cvs commit: Examining esproc/clip
Checking in esproc/clip/clip.c;
/cm/cvs/esproc/clip/clip.c,v  <--  clip.c
new revision: 164.8.2.2; previous revision: 164.8.2.1
done
Checking in esproc/clip/clip.h;
/cm/cvs/esproc/clip/clip.h,v  <--  clip.h
new revision: 164.8.2.2; previous revision: 164.8.2.1
done
Checking in esproc/clip/clip.nsd;
/cm/cvs/esproc/clip/clip.nsd,v  <--  clip.nsd
new revision: 164.8.2.2; previous revision: 164.8.2.1
done
Checking in esproc/clip/makefile;
/cm/cvs/esproc/clip/makefile,v  <--  makefile
new revision: 164.8.2.2; previous revision: 164.8.2.1
done

The branch has been extended!
Do I understand this......To continue on the branch, I must check
out the branch tag, not the branched revision??????
In our shop, we have all components of a source set set
to the same revision number. This is how we operate.
To get the latest branched version, do I need to simply
check out -r branch_tag_text???????

Thank you for your patience!
Regards,
David Berry



Larry Jones wrote:
> 
> 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 
> daves_takeoff_point
> 
> > 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 164.8.2.1 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