Datasheet

“main” (Installation and Administration) — 2004/6/25 — 13:29 — page 565 — #591
i
i
i
i
i
i
i
i
23
File Synchronization
as in cvs commit file1 directory1. New files and directories
must be added to the repository with a command like cvs add file1
directory1 before they are committed to the server. Subsequently, the
newly added files and directories can be committed: cvs commit file1
directory1.
If you change to another workstation, check out the synchronization repos-
itory, if this has not been done during an earlier session at the same work-
station (see above).
Start the synchronization with the server with cvs update. Update in-
dividual 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.
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 mod-
ified file and the file was changed and commited before in the same line,
you might get a conflict, indicated with C.
In this case look at conflict marks (»> and «<) in the file and decide be-
tween 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.
23.4.3 For More Information
This section merely offers a brief introduction to the many possibilities of
CVS. Extensive documentation is available at the following URLs:
http://www.cvshome.org/
http://www.gnu.org/manual/
565SUSE LINUX Enterprise Server