GNU Info
(cvs.info)update output
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. These two things accomplish the same thing.
`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. This is a reminder to you that the file needs to be
committed.
`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. This is a reminder to you that the file
needs to be committed.
`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.
CVS will print some messages if it merges your work, and a backup
copy of your working file (as it looked before you ran `update')
will be made. The exact name of that file is printed while
`update' runs.
`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; an unmodified copy of your file is also in your
working directory, with the name `.#FILE.REVISION' where REVISION
is the revision that your modified file started from. Resolve the
conflict as described in Note: Conflicts example. (Note that
some systems automatically purge files that begin with `.#' if
they have not been accessed for a few days. If you intend to keep
a copy of your original file, it is a very good idea to rename
it.) Under VMS, the file name starts with `__' rather than `.#'.
`? 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 (see the description of the `-I' option, and
Note: cvsignore).
automatically generated by info2www version 1.2.2.9