|Version Management with CVS - the CVS manual|
by Per Cederqvist et al.
Paperback (6"x9"), 216 pages, 8 figures
RRP £19.95 ($29.95)
4.9 Sticky tags
Sometimes a working copy's revision has extra data associated with it, for example it might be on a branch (see section 5 Branching and merging), or restricted to versions prior to a certain date by ‘checkout -D’ or ‘update -D’. Because this data persists--that is, it applies to subsequent commands in the working copy--we refer to it as sticky.
Most of the time, stickiness is an obscure aspect of CVS that you don't need to think about. However, even if you don't want to use the feature, you may need to know something about sticky tags (for example, how to avoid them!).
You can use the
status command to see if any
sticky tags or dates are set:
$ cvs status driver.c ========================================================= File: driver.c Status: Up-to-date Version: 18.104.22.168 Sat Dec 5 19:35:03 1992 RCS Version: 22.214.171.124 /u/cvsroot/yoyodyne/tc/driver.c,v Sticky Tag: rel-1-0-patches (branch: 1.7.2) Sticky Date: (none) Sticky Options: (none)
The sticky tags will remain on your working files until
you delete them with ‘cvs update -A’. The
‘-A’ option merges local changes into the version of the
file from the head of the trunk, removing any sticky tags,
dates, or options (other than sticky ‘-k’ options on locally
modified files). See section A.17 update--Bring work tree in sync with repository for more on the operation
The most common use of sticky tags is to identify which
branch one is working on, as described in
section 5.3 Accessing branches. However, non-branch
sticky tags have uses as well. For example,
suppose that you want to avoid updating your working
directory, to isolate yourself from possibly
destabilizing changes other people are making. You
can, of course, just refrain from running
update. But if you want to avoid updating only a
portion of a larger tree, then sticky tags can help.
If you check out a certain revision (such as 1.4) it
will become sticky. Subsequent
not retrieve the latest revision until you reset the
cvs update -A. Likewise, use of the
‘-D’ option to
sets a sticky date, which, similarly, causes that
date to be used for future retrievals.
People often want to retrieve an old version of
a file without setting a sticky tag. This can
be done with the ‘-p’ option to
update, which sends the contents of the file to
standard output. For example:
$ cvs update -p -r 1.1 file1 >file1 ========================================================= Checking out file1 RCS: /usr/local/cvsroot/first-dir/Attic/file1,v VERS: 1.1 *************** $
However, this isn't the easiest way, if you are asking
how to undo a previous checkin (in this example, put
‘file1’ back to the way it was as of revision
1.1). In that case you are better off using the
‘-j’ option to
update; for further
discussion see section 5.8 Merging differences between any two revisions.
|ISBN 0954161718||Version Management with CVS - the CVS manual||See the print edition|