src/usr.bin/cvs/cvs.1 - diff

Return to cvs.1 CVS log

Up to [local] / src / usr.bin / cvs

-version 1.28, 2005/01/18 15:16:27
+version 1.29, 2005/01/19 18:10:08
 Line 466
 Line 466
 Line 466
  .Nm
  to prune any directories that have become empty as a result of the update.
  .Pp
+ For each file updated, a single letter prefix is given to
+ specify the state of the file.
+ The possible prefixes are as follows:
+ .Bl -tag -width "XXX"
+ .It \&?
+ The file is unknown to
+ .Nm .
+ .It A
+ The file has been added with the
+ .Ic add
+ command, but has not been committed to the repository with the
+ .Ic commit
+ command.
+ .It C
+ A merge, with a more recent version of the file, has been done,
+ but unresolved conflicts still remain.
+ .It M
+ The file has been locally modified; if a more recent version
+ is available, the merge has been done without conflict.
+ .It P
+ The same as
+ .Sq U ,
+ but, in client-server mode, only differences are sent to save network
+ resources.
+ .It R
+ The file has been removed with the
+ .Ic remove
+ command, but has not been committed to the repository with the
+ .Ic commit
+ command.
+ .It U
+ The file is up to date.
+ .El
+ .Pp
  Aliases:
  .Ic up ,
  .Ic upd .