File status
===========

   The `file status' field can have the following values for the
commands `M-x cvs-update' and `M-x cvs-examine':

`Updated'
     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.

`Patched'
     The file was brought up to date with respect to a remote
     repository by way of fetching and applying a patch to the file in
     your source.  This is done for any file that exists in a remote
     repository and in your source; of which you haven't changed
     locally but is not the most recent version available in the remote
     repository.

`Modified'
     The file is modified in  your  working  directory, and there was no
     modification to the same file in the repository.

`Merged'
     The file is modified in your working directory, and there were
     modifications in the repository as well as in your copy, but they
     were merged successfully, without conflict, in your working
     directory.

`Conflict'
     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 output of the `rcsmerge' command on
     the two versions; an unmodified copy of your file is also in your
     working directory, with the name `.#FILE.VERSION', where VERSION
     is the RCS revision that your modified file started from.  *Note
     Viewing differences::, for more details.

`Added'
     The file has been added by you, but it still needs to be checked
     in to the repository.

`Removed'
     The file has been removed by you, but it needs to be checked in to
     the repository.  You can resurrect it by typing `a' (*note Adding
     and removing files::.).

`Unknown'
     A file that was detected in your directory, but that neither
     appears in the repository, nor is present on the list of files
     that CVS should ignore.

`Removed by you, changed in repository'
     You have removed a file, and before you committed the removal
     someone committed a change to that file.  You can use `a' to
     resurrect the file (see Adding and removing files.).

   For the command `M-x cvs-status', the `file status' field can have
the following additional values:

`Up-to-date'
     The file is up to date with respect to the version in the
     repository.

`Need-update'
     Either a newer version than the one in your source is available in
     the repository and you have not modified your checked out version,
     or the file exists in the repository but not in your source.  Use
     `cvs-mode-update' bound to `O' to update the file.

`Need-merge'
     You have modified the checked out version of the file, and a newer
     version is available in the repository.  A merge will take place
     when you run a `cvs update'.

`Need-remove'
     The file has been removed from your working directory but not yet
     `cvs remove'd.

`Unresolved-conflict'
     There was an unresolved conflict when merging changes from the
     repository into the file.