
836
|
Chapter 13: The Concurrent Versions System (CVS)
This is the Title of the Book, eMatter Edition
Copyright © 2006 O’Reilly & Associates, Inc. All rights reserved.
update
cvs [cvs-options] update [options] [files ...]
Download changes from the repository to an existing sandbox.
While doing this, update merges changes from the repository into
changed files in the sandbox. See also checkout and export.
If update cannot merge repository changes with sandbox changes
without losing data, it reports a conflict.
If update is not given any filenames or directory names as parame-
ters, it acts on the current sandbox.
Synonyms: up, upd
Standard subcommand options: -D, -f, -k, -l, -r, -R
Options
-A Clear sticky tags, dates, and keyword-expansion modes and
replace the current files in the sandbox with the head of the
trunk.
-C Replace any file that has been changed locally with the revi-
sion from the repository that the local file was based on. The
modified local file is saved as .#file.revision in its local
sandbox directory.
-d Create any directories that are in the repository but not in the
sandbox. By default, update works only on the directories that
are currently in the sandbox and ignores any new directories.
-I file
Ignore the named file when updating. -I can be used more
than once. Use -I ! to clear the list of ignored files.
-j revision[:date]
Determine the changes between the revision the files in the