=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.1,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- src/usr.bin/cvs/cvs.1 2007/04/13 07:34:06 1.105 +++ src/usr.bin/cvs/cvs.1 2007/04/14 13:34:44 1.106 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.105 2007/04/13 07:34:06 xsa Exp $ +.\" $OpenBSD: cvs.1,v 1.106 2007/04/14 13:34:44 jmc Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau .\" Copyright (c) 2004-2007 Xavier Santolaria @@ -68,7 +68,7 @@ .Fl f option (see below). See -.Xr cvsrc 5 +.Xr cvs 5 for further information. .Pp .Nm @@ -1752,263 +1752,12 @@ such as .Xr vi 1 . .El -.Sh FILES -.Bl -tag -width Ds -.It Pa $CVSROOT/CVSROOT -Directory containing repository administrative files. -.It Pa $CVSROOT/CVSROOT/config -File containing various configuration options. -The format of each line is as follows: -.Pp -.Dl keyword=value -.Pp -Extraneous spaces or tabs are not permitted. -A line beginning with a hash character -.Pq Sq # -is considered a comment and ignored. -.Pp -The following options are available: -.Pp -.Bl -tag -width "dlimit=XvalueXXX" -offset indent -compact -.It dlimit='value' -Set the process data size limit. -.It tag='value' -Set the name of a local tag to use in addition to Id. -.It umask='value' -Set the default umask to use when creating files and directories. -.El -.It Pa $CVSROOT/CVSROOT/history -File containing reports of -.Ic checkout , -.Ic commit , -.Ic export , -.Ic release , -.Ic rtag , -and -.Ic update -commands that have been issued. -By default, the -.Ic init -command creates the -.Pa history -file. -To disable history logging, the -.Pa history -file should be removed manually. -The -.Ic history -command shows these reports according to several criteria. -.It Pa $CVSROOT/CVSROOT/loginfo -File containing associations between modules and handlers for -post-commit logging. -.El -.Pp -Each directory that is managed by -.Nm -contains a -.Pa CVS -directory. -This directory is used by various -.Nm -commands to record the status of files in the current working directory. -These files should not be modified manually by the user but by the -.Nm -commands instead. -Files that are always stored in every -.Pa CVS -directory are as follows: -.Bl -tag -width Ds -.It Pa CVS/Entries -File containing a list of files managed by -.Nm . -.Pa Entries -has one line per file or directory describing the state of it with -regard to the source repository. -These lines have the following format: -.Pp -.Dl /name/revision/timestamp/options/tag -.Bl -tag -width Ds -.It name -Name of the file in the directory. -.It revision -Revision of the file in the working directory. -The revision is equal to -.Sq 0 -if the file has been added with the -.Ic add -command or preceded by the -.Sq - -character if the file has been removed with the -.Ic remove -command. -.It timestamp -Contains the timestamp of the file at the time -.Nm -created it. -If the timestamp is different from the actual modification time of the file, -it means that the file has been modified. -.It options -Contains the keyword substitution mode used for this file. -.It tag -Contains -.Sq T -followed by a tagname or -.Sq D -followed by a date. -.El -.Pp -Entries corresponding to directories have the following format: -.Pp -.Dl D/name//// -.Pp -The lines in the -.Pa Entries -file can be in any order. -.It Pa CVS/Repository -File containing the path to the corresponding directory in the -source repository. -.It Pa CVS/Root -File containing the value of the -.Ev CVSROOT -variable at the time of checkout. -This file is used by all -.Nm -commands instead of -.Ev CVSROOT -once -.Nm -has checked for its existence. -.El -.Pp -Depending on the circumstances, other files may exist in the -.Pa CVS -directory: -.Bl -tag -width Ds -.It Pa CVS/Base -If pseudo-lock mode is enabled in client-server mode, -the -.Pa Base -directory contains a copy of the file on which the -.Ic edit -command has been issued. -This allows the -.Ic unedit -command to operate even if the CVS server is unreachable. -.It Pa CVS/Baserev -File listing the revisions for each file contained in the -.Pa Base -directory under the following format: -.Pp -.Dl name/revision/ -.It Pa CVS/Baserev.tmp -Temporary file used to write -.Pa CVS/Baserev -content then atomically renamed to -.Pa Baserev . -.It Pa CVS/Checkin.prog -File containing the path to the command specified with the -.Fl i -option in the -.Pa CVSROOT/modules -file. -.It Pa CVS/Entries.Backup -Temporary file used to write -.Pa CVS/Entries -content then atomically renamed to -.Pa Entries . -.It Pa CVS/Entries.Static -Tells -.Nm -to not add files to the directory unless the -.Ic update -command is issued with the -.Fl d -option. -.It Pa CVS/Notify -File containing the notifications that could not be sent to the -CVS server but will be sent at the next successful connection. -.It Pa CVS/Notify.tmp -Temporary file used to write -.Pa CVS/Notify -content then atomically renamed to -.Pa Notify . -.It Pa CVS/Tag -File containing the symbolic revision that was used at checkout. -The first character of the line is a single letter indicating the -type of tag: -.Sq D , -.Sq N , -or -.Sq T , -for date, non-branch tag, or branch tag, respectively. -The rest of the line is the tag or date itself. -The -.Pa Tag -file should not be removed manually: -instead, use -.Dq update -A . -.It Pa CVS/Template -File containing the template specified by the -.Pa CVSROOT/rcsinfo -file. -It is only used in client-server mode. -Locally, -.Nm -uses the -.Pa rcsinfo -file directly. -.It Pa CVS/Update.prog -File containing the path to the command specified with the -.Fl u -option in the -.Pa CVSROOT/modules -file. -.It Pa CVS/,t -File containing the description of the file -.Pa file -that has been added with the -.Ic add -command. -This description is used by -.Nm -when archiving this file with the -.Ic commit -command. -.It Pa $HOME/.cvsignore -File containing a list of files (or -.Xr sh 1 -file name patterns) that should be ignored by -.Nm -during the -.Ic import , -.Ic release , -and -.Ic update -commands. -.It Pa $HOME/.cvsrc -File containing a list of implicit options to pass to certain commands. -This file is read on startup unless the -.Fl f -option is specified. -.It Pa $TMPDIR/cvs-serv Ns Aq Pa pid -Temporary directory created by the server where -.Ar pid -is the process ID of the server. -It is located in the directory specified by the -.Ev TMPDIR -environment variable or the -.Fl T -global option. -See above for more information. -.El .Sh SEE ALSO .Xr diff 1 , .Xr gzip 1 , .Xr patch 1 , .Xr rcs 1 , -.Xr cvsignore 5 , -.Xr cvsrc 5 , -.Xr cvswrappers 5 , +.Xr cvs 5 , .Xr cvsintro 7 .Sh HISTORY The OpenCVS project is a BSD-licensed rewrite of the original