Novell LINUX ENTERPRISE SERVER 10 SP2 - INSTALLATION AND ADMINISTRATION Installation Manual page 758

Start the synchronization with the server with cvs update. Update individual files
or directories as in cvs update file1 directory1. To see the difference between
the current files and the versions stored on the server, use the command cvs diff or
cvs diff file1 directory1. Use cvs -nq update to see which files would
be affected by an update.
Here are some of the status symbols displayed during an update:
U
The local version was updated. This affects all files that are provided by the server
and missing on the local system.
M
The local version was modified. If there were changes on the server, it was possible
to merge the differences in the local copy.
P
The local version was patched with the version on the server.
C
The local file conflicts with current version in the repository.
?
This file does not exist in CVS.
The status M indicates a locally modified file. Either commit the local copy to the
server or remove the local file and run the update again. In this case, the missing file
is retrieved from the server. If you commit a locally modified file and the file was
changed in the same line and committed, you might get a conflict, indicated with C.
In this case, look at the conflict marks (»> and «<) in the file and decide between the
two versions. As this can be a rather unpleasant job, you might decide to abandon your
changes, delete the local file, and enter cvs up to retrieve the current version from the
server.
39.3.3 For More Information
This section merely offers a brief introduction to the many possibilities of CVS. Exten-
sive documentation is available at the following URLs:
740 Installation and Administration