Mac OS X Panther in a Nutshell, 2nd Edition

Name

update

Synopsis

update 
  [ -A ] 
  [ -C ] 
  [ -d ] 
  [ -D date | -r rev ] 
  [ -f ] 
  [ -I pattern ] 
  [ -j rev1 [ -j rev2 ]  
  [ -k kflag ] 
  [ -l | -R ] 
  [ -p ] 
  [ -P ] 
  [ -W spec ] 
  [ file ... ]

Update the sandbox, merging in any changes from the repository. For example:

                        cvs -n -q update -AdP

can do a quick status check of the current sandbox versus the head of the trunk of development.

The standard meanings of the common client options -D, -f, -k, -l, -r, and -R apply. Additional options are:

-A

Reset sticky tags.

-C

Replace modified files with clean copies.

-d

Create and update new directories.

-I pattern

Provide filename patterns for files to ignore.

-j revision

Merge in (join) changes between two revisions.

-p

Check out files to standard output.

-P

Prune empty directories.

-W spec

Provide wrapper specification.

When using -C, CVS makes backups of modified files before copying the clean version. The backup files are named .#file.revision.

Using -D or -r results in sticky dates or tags, respectively, on the affected files (using -p along with these prevents stickiness). Use -A to reset any sticky tags or dates.

If two -j specifications are made, the differences between them are computed and applied to the current file. If only one is given, the common ancestor of the sandbox revision and the specified revision is used as a basis for computing differences to be merged. For example, suppose a project has an experimental branch, and important changes to the file foo.c were introduced between revisions 1.2.2.1 and ...