update: Bring Work Tree in Sync with Repository

You can use the `update' command from within your working directory to reconcile your work with any revisions applied to the source repository since your last checkout or update.

 update [-AdflPpR] [-d] [-r tag|-D date] files...

Your modifications to a file are never lost when you use `update'.

Useful Options:

`-A'
  Reset any sticky tags, dates, etc.

`-C'
  Overwrite locally modified files with clean copies from the
  repository (the modified file is saved in `.#FILE.REVISION',
  however).

`-d'
  Create any directories that exist in the repository if they're
  missing from the working directory. 
  ( Normally, `update' acts only
  on directories and files that were already enrolled in your
  working directory.)

`-I NAME'
  Ignore files whose names match NAME (in your working directory)
  during the update.  You can specify `-I' more than once on the
  command line to specify several files to ignore.

Update Output

`update' and `checkout' keep you informed of their progress by printing a line for each file, preceded by one character indicating the status of the file:


`U FILE'
  The file was brought up to date with respect to the repository.
  This is done for any file that exists in the repository but not in
  your source, and for files that you haven't changed but are not
  the most recent versions available in the repository.

`P FILE'
  Like `U', but the CVS server sends a patch instead of an entire
  file.  This accomplishes the same thing as `U' using less
  bandwidth.

`A FILE'
  The file has been added to your private copy of the sources, and
  will be added to the source repository when you run `commit' on
  the file. 

`R FILE'
  The file has been removed from your private copy of the sources,
  and will be removed from the source repository when you run
  `commit' on the file.  

`M FILE'
  The file is modified in  your  working  directory.
  `M' can indicate one of two states for a file you're working on:
  either there were no modifications to the same file in the
  repository, so that your file remains as you last saw it; or there
  were modifications in the repository as well as in your copy, but
  they were merged successfully, without conflict, in your working
  directory.

`C FILE'
  A conflict was detected while trying to merge your changes to FILE
  with changes from the source repository.  FILE (the copy in your
  working directory) is now the result of attempting to merge the
  two revisions. Resolve the conflict.

`? FILE'
  FILE is in your working directory, but does not correspond to
  anything in the source repository, and is not in the list of files
  for CVS to ignore.