[BACK]Return to cvs.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/cvs.1 between version 1.90 and 1.91

version 1.90, 2005/09/07 16:24:22 version 1.91, 2006/01/06 17:07:39
Line 242 
Line 242 
 command to freeze the values before releasing software.  command to freeze the values before releasing software.
 .El  .El
 .Sh COMMANDS  .Sh COMMANDS
 The following commands are supported by  .Nm
 .Nm :  supports the following commands:
 .Bl -tag -width Ds  add,
 .It Xo Ic add  admin,
 .Op Fl k Ar mode  annotate,
 .Op Fl m Ar msg  checkout,
 .Ar file ...  commit,
 .Xc  diff,
   edit,
   editors,
   export,
   history,
   import,
   init,
   kserver,
   log,
   login,
   logout,
   rdiff,
   release,
   remove,
   rlog,
   rtag,
   server,
   status,
   tag,
   unedit,
   update,
   version,
   watch,
   watchers.
   The commands are fully explained in this section.
   .Ss add
 Before a file is known to  Before a file is known to
 .Nm ,  .Nm ,
 it must be added to the repository using this command.  it must be added to the repository using this command.
Line 265 
Line 290 
 command alone; the  command alone; the
 .Ic commit  .Ic commit
 command is not necessary.  command is not necessary.
   .Bd -literal -offset indent
   Usage: cvs add [-k mode] [-m msg] file ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic add  .Ic add
Line 281 
Line 309 
 Aliases:  Aliases:
 .Ic ad ,  .Ic ad ,
 .Ic new .  .Ic new .
 .It Xo Ic admin  .Ss admin
 .Op Fl Iq  
 .Op Fl b Ar branch  
 .Op Fl k Ar mode  
 .Op Fl m Ar rev : Ns Ar msg  
 .Oo Fl N Ar tag Ns  
 .Op : Ns Ar rev Oc  
 .Oo Fl n Ar tag Ns  
 .Op : Ns Ar rev Oc  
 .Op Fl o Ar rev  
 .Oo Fl s Ar state Ns  
 .Op : Ns Ar rev Oc  
 .Oo Fl t Ar file \*(Ba  
 .Ar str Oc  
 .Xc  
 The  The
 .Ic admin  .Ic admin
 command is used to directly modify the RCS files.  command is used to directly modify the RCS files.
   .Bd -literal -offset indent
   Usage: cvs admin [-Iq] [-b branch] [-k mode] [-m rev:msg]
                    [-N tag[:rev]] [-n tag[:rev]] [-o rev]
                    [-s state[:rev]] [-t file | str]
   .Ed
 .Pp  .Pp
 The  The
 .Ic admin  .Ic admin
Line 406 
Line 425 
 Aliases:  Aliases:
 .Ic adm ,  .Ic adm ,
 .Ic rcs .  .Ic rcs .
 .It Xo Ic annotate  .Ss annotate
 .Op Fl flR  
 .Oo Fl D Ar date \*(Ba  
 .Fl r Ar rev Oc  
 .Op Ar file ...  
 .Xc  
 For each line of any files specified, show information about its  For each line of any files specified, show information about its
 last revision.  last revision.
 The information given is the last revision when a modification occurred,  The information given is the last revision when a modification occurred,
 the author's name, and the date of the revision.  the author's name, and the date of the revision.
   .Bd -literal -offset indent
   Usage: cvs annotate [flR] [-D date | -r rev] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic annotate  .Ic annotate
Line 449 
Line 466 
 Aliases:  Aliases:
 .Ic ann ,  .Ic ann ,
 .Ic blame .  .Ic blame .
 .It Xo Ic checkout  .Ss checkout
 .Op Fl AcflNnPpRs  
 .Op Fl d Ar dir  
 .Op Fl j Ar rev  
 .Op Fl k Ar mode  
 .Fl D Ar date \*(Ba  
 .Fl r Ar rev  
 .Ar module ...  
 .Xc  
 .Pp  
 The  The
 .Ic checkout  .Ic checkout
 command is used to create a local copy of one or more modules present on the  command is used to create a local copy of one or more modules present on the
 target CVS repository.  target CVS repository.
   .Bd -literal -offset indent
   Usage: cvs checkout [-AcflNnPpRs] [-d dir] [-j rev] [-k mode]
                       -D date | -r rev module ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic checkout  .Ic checkout
Line 532 
Line 544 
 Aliases:  Aliases:
 .Ic co ,  .Ic co ,
 .Ic get .  .Ic get .
 .It Xo Ic commit  .Ss commit
 .Op Fl flnR  
 .Oo Fl F Ar logfile \*(Ba  
 .Fl m Ar msg Oc  
 .Op Fl r Ar rev  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic commit  .Ic commit
 command is used to send local changes back to the server and update the  command is used to send local changes back to the server and update the
 repository's information to reflect the changes.  repository's information to reflect the changes.
   .Bd -literal -offset indent
   Usage: cvs commit [-flnR] [-F logfile | -m msg] [-r rev] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic commit  .Ic commit
Line 574 
Line 582 
 Aliases:  Aliases:
 .Ic ci ,  .Ic ci ,
 .Ic com .  .Ic com .
 .It Xo Ic diff  .Ss diff
 .Op Fl cilNnpRu  
 .Oo Oo Fl D  
 .Ar date1 \*(Ba  
 .Fl r Ar rev1 Oc  
 .Oo Fl D Ar date2 \*(Ba  
 .Fl r Ar rev2 Oc Oc  
 .Op Fl k Ar mode  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic diff  .Ic diff
 command is very similar to the  command is very similar to the
 .Xr diff 1  .Xr diff 1
 program, except that the differential comparisons that it generates are  program, except that the differential comparisons that it generates are
 between local or remote revisions of files stored in the CVS repository.  between local or remote revisions of files stored in the CVS repository.
   .Bd -literal -offset indent
   Usage: cvs diff [-cilNnpRu]
                   [[-D date1 | -r rev1] [-D date2 | -r rev2]]
                   [-k mode] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic diff  .Ic diff
Line 658 
Line 661 
 Aliases:  Aliases:
 .Ic di ,  .Ic di ,
 .Ic dif .  .Ic dif .
 .It Xo Ic edit Op Fl lR  .Ss edit
 .Op Fl a Ar action  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic edit  .Ic edit
 command is used to make a file that is being watched  command is used to make a file that is being watched
Line 674 
Line 673 
 Editing rights on the file can be given up using the  Editing rights on the file can be given up using the
 .Ic unedit  .Ic unedit
 command, which terminates the temporary notifications.  command, which terminates the temporary notifications.
   .Bd -literal -offset indent
   Usage: cvs edit [-lR] [-a action] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic edit  .Ic edit
Line 711 
Line 713 
 Enable recursive behaviour.  Enable recursive behaviour.
 This is the default.  This is the default.
 .El  .El
 .It Xo Ic editors  .Ss editors
 .Op Fl lR  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic editors  .Ic editors
 command lists the users with edition rights on a file.  command lists the users with edition rights on a file.
Line 725 
Line 723 
 The e-mail address of the user editing the file, the timestamp  The e-mail address of the user editing the file, the timestamp
 when the edition first started, the host from where the edition  when the edition first started, the host from where the edition
 has been requested and the path to the edited file are listed.  has been requested and the path to the edited file are listed.
   .Bd -literal -offset indent
   Usage: cvs editors [-lR] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic editors  .Ic editors
Line 737 
Line 738 
 Enable recursive behaviour.  Enable recursive behaviour.
 This is the default.  This is the default.
 .El  .El
 .It Xo Ic export  .Ss export
 .Op Fl flNnR  
 .Op Fl d Ar dir  
 .Op Fl k Ar mode  
 .Fl D Ar date \*(Ba  
 .Fl r Ar rev  
 .Ar module ...  
 .Xc  
 .Pp  
 The  The
 .Ic export  .Ic export
 command extracts a copy of  command extracts a copy of
Line 759 
Line 752 
 .Pp  .Pp
 The checked out module's files will be placed in a directory  The checked out module's files will be placed in a directory
 bearing the same name as the checked out module, by default.  bearing the same name as the checked out module, by default.
   .Bd -literal -offset indent
   Usage: cvs export [-flNnR] [-d dir] [-k mode]
                     -D date | -r rev module ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic export  .Ic export
Line 813 
Line 810 
 Aliases:  Aliases:
 .Ic ex ,  .Ic ex ,
 .Ic exp .  .Ic exp .
 .It Xo Ic history  .Ss history
 .Op Fl aceloTw  
 .Op Fl b Ar str  
 .Op Fl D Ar date  
 .Op Fl f Ar file  
 .Op Fl m Ar module  
 .Op Fl n Ar module  
 .Op Fl p Ar path  
 .Op Fl r Ar rev  
 .Op Fl t Ar tag  
 .Op Fl u Ar user  
 .Op Fl x Ar ACEFGMORTUW  
 .Op Fl z Ar tz  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic history  .Ic history
 command is used to display the history of actions done in the  command is used to display the history of actions done in the
Line 845 
Line 827 
 and  and
 .Ic update  .Ic update
 commands are logged into this file.  commands are logged into this file.
   .Bd -literal -offset indent
   Usage: cvs history [-aceloTw] [-b str] [-D date] [-f file]
                      [-m module] [-n module] [-p path] [-r rev]
                      [-t tag] [-u user] [-x ACEFGMORTUW] [-z tz]
                      [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic history  .Ic history
Line 999 
Line 987 
 Aliases:  Aliases:
 .Ic hi ,  .Ic hi ,
 .Ic his .  .Ic his .
 .It Xo Ic import  .Ss import
 .Op Fl d  
 .Op Fl b Ar branch  
 .Op Fl I Ar ign  
 .Op Fl k Ar mode  
 .Op Fl m Ar msg  
 .Op Fl W Ar spec  
 .Ar module  
 .Ar vendortag  
 .Ar releasetag  
 .Xc  
 .Pp  
 Import sources into CVS using vendor branches.  Import sources into CVS using vendor branches.
 .Pp  .Pp
 At least three arguments are required:  At least three arguments are required:
Line 1021 
Line 998 
 .Ar releasetag  .Ar releasetag
 is used to identify the files you created with  is used to identify the files you created with
 .Ic cvs import .  .Ic cvs import .
   .Bd -literal -offset indent
   Usage: cvs import [-d] [-b branch] [-I ign] [-k mode] [-m msg]
                     [-W spec] module vendortag releasetag
   .Ed
 .Pp  .Pp
 The  The
 .Ic import  .Ic import
Line 1049 
Line 1030 
 Aliases:  Aliases:
 .Ic im ,  .Ic im ,
 .Ic imp .  .Ic imp .
 .It Ic init  .Ss init
 Create a CVS repository if it doesn't exist.  Create a CVS repository if it doesn't exist.
 .It Ic kserver  .Ss kserver
 Start a Kerberos authentication server.  Start a Kerberos authentication server.
 .It Xo Ic log  .Ss log
 .Op Fl bhlNRt  
 .Op Fl d Ar dates  
 .Op Fl r Ar revs  
 .Op Fl s Ar state  
 .Op Fl w Ar users  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic log  .Ic log
 command displays information on a  command displays information on a
Line 1072 
Line 1045 
 .Ic log  .Ic log
 command displays all the available information; the options are only  command displays all the available information; the options are only
 used to restrict the displayed information.  used to restrict the displayed information.
   .Bd -literal -offset indent
   Usage: cvs log [-bhlNRt] [-d dates] [-r revs] [-s state]
                  [-w users] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic log  .Ic log
Line 1172 
Line 1149 
 .Pp  .Pp
 Aliases:  Aliases:
 .Ic lo .  .Ic lo .
 .It Ic login  .Ss login
 Prompt for a password for an authenticating server.  Prompt for a password for an authenticating server.
 .It Ic logout  .Ss logout
 Remove an entry in  Remove an entry in
 .Pa .cvspass  .Pa .cvspass
 for a remote repository.  for a remote repository.
 .It Xo Ic rdiff  .Ss rdiff
 .Op Fl flR  
 .Oo Fl c \*(Ba  
 .Fl u Oc  
 .Oo Fl s \*(Ba  
 .Fl t Oc  
 .Op Fl V Ar ver  
 .Fl D Ar date \*(Ba  
 .Fl r Ar rev  
 .Oo Fl D Ar date2 \*(Ba  
 .Fl r Ar rev2 Oc  
 .Ar module ...  
 .Xc  
 .Pp  
 The  The
 .Ic rdiff  .Ic rdiff
 command lists differences between two revisions in a  command lists differences between two revisions in a
Line 1199 
Line 1163 
 compatible format.  compatible format.
 This command does not need a local checkout of the repository  This command does not need a local checkout of the repository
 to work.  to work.
   .Bd -literal -offset indent
   Usage: cvs rdiff [-flR] [-c | -u] [-s | -t] [-V ver]
                    -D date | -r rev [-D date2 | -r rev2]
                    module ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic rdiff  .Ic rdiff
Line 1254 
Line 1223 
 Aliases:  Aliases:
 .Ic pa ,  .Ic pa ,
 .Ic patch .  .Ic patch .
 .It Xo Ic release  .Ss release
 .Op Fl d  
 .Ar dir ...  
 .Xc  
 The  The
 .Ic release  .Ic release
 command indicates to  command indicates to
Line 1270 
Line 1236 
 correct (see the  correct (see the
 .Ic history  .Ic history
 command).  command).
   .Bd -literal -offset indent
   Usage: cvs release [-d] dir ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic release  .Ic release
Line 1318 
Line 1287 
 Aliases:  Aliases:
 .Ic re ,  .Ic re ,
 .Ic rel .  .Ic rel .
 .It Xo Ic remove  .Ss remove
 .Op Fl flR  
 .Op Ar file ...  
 .Xc  
 The  The
 .Ic remove  .Ic remove
 command is used to inform  command is used to inform
Line 1347 
Line 1313 
 (Note that the  (Note that the
 .Ic export  .Ic export
 command always removes empty directories.)  command always removes empty directories.)
   .Bd -literal -offset indent
   Usage: cvs remove [-flR] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic remove  .Ic remove
Line 1367 
Line 1336 
 Aliases:  Aliases:
 .Ic rm ,  .Ic rm ,
 .Ic delete .  .Ic delete .
 .It Ic rlog  .Ss rlog
 Print out history information for a module.  Print out history information for a module.
 .It Xo Ic rtag  .Ss rtag
 .Op Fl abdFflnR  
 .Oo Fl D Ar date \*(Ba  
 .Fl r Ar rev Oc  
 .Ar symbolic_tag  
 .Ar modules ...  
 .Xc  
 The  The
 .Ic rtag  .Ic rtag
 command adds a symbolic tag to one or more modules.  command adds a symbolic tag to one or more modules.
 It is often used to create a new branch using the  It is often used to create a new branch using the
 .Fl b  .Fl b
 option.  option.
   .Bd -literal -offset indent
   Usage: cvs rtag [-abdFflnR] [-D date | -r rev]
                   symbolic_tag module ...
   .Ed
 .Pp  .Pp
 The  The
 .Ic rtag  .Ic rtag
Line 1424 
Line 1391 
 Aliases:  Aliases:
 .Ic rt ,  .Ic rt ,
 .Ic rfreeze .  .Ic rfreeze .
 .It Ic server  .Ss server
 Server mode.  Server mode.
 .It Xo Ic status  .Ss status
 .Op Fl lRv  
 .Op Ar file ...  
 .Xc  
 The  The
 .Ic status  .Ic status
 command is used to display the state of checked out files.  command is used to display the state of checked out files.
   .Bd -literal -offset indent
   Usage: cvs status [-lRv] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic status  .Ic status
Line 1483 
Line 1450 
 Aliases:  Aliases:
 .Ic st ,  .Ic st ,
 .Ic stat .  .Ic stat .
 .It Xo Ic tag  .Ss tag
 .Op Fl bcdFflR  
 .Oo Fl D Ar date \*(Ba  
 .Fl r Ar rev Oc  
 .Op Ar symbolic_tag  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic tag  .Ic tag
 command adds a symbolic tag to a checked out version of one or more files.  command adds a symbolic tag to a checked out version of one or more files.
   .Bd -literal -offset indent
   Usage: cvs tag [-bcdFflR] [-D date | -r rev] [symbolic_tag]
                  [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic tag  .Ic tag
Line 1530 
Line 1494 
 Aliases:  Aliases:
 .Ic ta ,  .Ic ta ,
 .Ic freeze .  .Ic freeze .
 .It Xo Ic unedit Op Fl lR  .Ss unedit
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic unedit  .Ic unedit
 command is used to give up an edition on a file and thus cancel  command is used to give up an edition on a file and thus cancel
Line 1544 
Line 1505 
 .Nm  .Nm
 will ask if you want to go back to the previous version, and lose the  will ask if you want to go back to the previous version, and lose the
 modifications done on the file, or stay in edition mode on it.  modifications done on the file, or stay in edition mode on it.
   .Bd -literal -offset indent
   Usage: cvs unedit [-lR] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic unedit  .Ic unedit
Line 1556 
Line 1520 
 Enable recursive behaviour.  Enable recursive behaviour.
 This is the default.  This is the default.
 .El  .El
 .It Xo Ic update  .Ss update
 .Op Fl AdflPpR  
 .Oo Fl D Ar date \*(Ba  
 .Fl r Ar rev Oc  
 .Op Fl I Ar ign  
 .Op Fl j Ar rev  
 .Op Fl k Ar mode  
 .Op Fl W Ar spec  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic update  .Ic update
 command is used to merge any of the changes that have occurred on the remote  command is used to merge any of the changes that have occurred on the remote
 repository into the local one where the command was run.  repository into the local one where the command was run.
   .Bd -literal -offset indent
   Usage: cvs update [-AdflPpR] [-D date | -r rev] [-I ign]
                     [-j rev] [-k mode] [-W spec] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic update  .Ic update
Line 1672 
Line 1630 
 Aliases:  Aliases:
 .Ic up ,  .Ic up ,
 .Ic upd .  .Ic upd .
 .It Ic version  .Ss version
 Causes  Causes
 .Nm  .Nm
 to print its version information.  to print its version information.
Line 1688 
Line 1646 
 Aliases:  Aliases:
 .Ic ve ,  .Ic ve ,
 .Ic ver .  .Ic ver .
 .It Xo Ic watch  .Ss watch
 .Ar on | off | add | remove  
 .Op Fl lR  
 .Op Fl a Ar action  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic watch  .Ic watch
 command switches a file from normal mode to  command switches a file from normal mode to
Line 1727 
Line 1679 
 made available with the  made available with the
 .Ic edit  .Ic edit
 command.  command.
   .Bd -literal -offset indent
   Usage: cvs watch on | off | add | remove [-lR] [-a action]
                    [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic watch  .Ic watch
Line 1763 
Line 1719 
 Enable recursive behaviour.  Enable recursive behaviour.
 This is the default.  This is the default.
 .El  .El
 .It Xo Ic watchers  .Ss watchers
 .Op Fl lR  
 .Op Ar file ...  
 .Xc  
 .Pp  
 The  The
 .Ic watchers  .Ic watchers
 command lists the users who asked for notifications as well as the  command lists the users who asked for notifications as well as the
Line 1795 
Line 1747 
 or  or
 .Ic unedit  .Ic unedit
 command is issued on a file.  command is issued on a file.
   .Bd -literal -offset indent
   Usage: cvs watchers [-lR] [file ...]
   .Ed
 .Pp  .Pp
 The  The
 .Ic watchers  .Ic watchers
Line 1806 
Line 1761 
 .It Fl R  .It Fl R
 Enable recursive behaviour.  Enable recursive behaviour.
 This is the default.  This is the default.
 .El  
 .El  .El
 .Sh ENVIRONMENT  .Sh ENVIRONMENT
 .Bl -tag -width Ds  .Bl -tag -width Ds

Legend:
Removed from v.1.90  
changed lines
  Added in v.1.91