diff options
Diffstat (limited to 'gnu/usr.bin/cvs/doc/cvs.info-6')
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-6 | 1408 |
1 files changed, 439 insertions, 969 deletions
diff --git a/gnu/usr.bin/cvs/doc/cvs.info-6 b/gnu/usr.bin/cvs/doc/cvs.info-6 index dd7ac22a0ce..e55211933fc 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-6 +++ b/gnu/usr.bin/cvs/doc/cvs.info-6 @@ -1,5 +1,5 @@ This is Info file cvs.info, produced by Makeinfo version 1.67 from the -input file ./cvs.texinfo. +input file ../../work/ccvs/doc/cvs.texinfo. START-INFO-DIR-ENTRY * CVS: (cvs). Concurrent Versions System @@ -23,6 +23,430 @@ versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. +File: cvs.info, Node: diff, Next: export, Prev: commit, Up: CVS commands + +diff--Show differences between revisions +======================================== + + * Synopsis: diff [-lR] [format_options] [[-r rev1 | -D date1] [-r + rev2 | -D date2]] [files...] + + * Requires: working directory, repository. + + * Changes: nothing. + + The `diff' command is used to compare different revisions of files. +The default action is to compare your working files with the revisions +they were based on, and report any differences that are found. + + If any file names are given, only those files are compared. If any +directories are given, all files under them will be compared. + + The exit status for diff is different than for other CVS commands; +for details *Note Exit status::. + +* Menu: + +* diff options:: diff options +* diff examples:: diff examples + + +File: cvs.info, Node: diff options, Next: diff examples, Up: diff + +diff options +------------ + + These standard options are supported by `diff' (*note Common +options::., for a complete description of them): + +`-D DATE' + Use the most recent revision no later than DATE. See `-r' for how + this affects the comparison. + +`-k KFLAG' + Process keywords according to KFLAG. See *Note Keyword + substitution::. + +`-l' + Local; run only in current working directory. + +`-R' + Examine directories recursively. This option is on by default. + +`-r TAG' + Compare with revision TAG. Zero, one or two `-r' options can be + present. With no `-r' option, the working file will be compared + with the revision it was based on. With one `-r', that revision + will be compared to your current working file. With two `-r' + options those two revisions will be compared (and your working + file will not affect the outcome in any way). + + One or both `-r' options can be replaced by a `-D DATE' option, + described above. + + The following options specify the format of the output. They have +the same meaning as in GNU diff. + + -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 + --binary + --brief + --changed-group-format=ARG + -c + -C NLINES + --context[=LINES] + -e --ed + -t --expand-tabs + -f --forward-ed + --horizon-lines=ARG + --ifdef=ARG + -w --ignore-all-space + -B --ignore-blank-lines + -i --ignore-case + -I REGEXP + --ignore-matching-lines=REGEXP + -h + -b --ignore-space-change + -T --initial-tab + -L LABEL + --label=LABEL + --left-column + -d --minimal + -N --new-file + --new-line-format=ARG + --old-line-format=ARG + --paginate + -n --rcs + -s --report-identical-files + -p + --show-c-function + -y --side-by-side + -F REGEXP + --show-function-line=REGEXP + -H --speed-large-files + --suppress-common-lines + -a --text + --unchanged-group-format=ARG + -u + -U NLINES + --unified[=LINES] + -V ARG + -W COLUMNS + --width=COLUMNS + + +File: cvs.info, Node: diff examples, Prev: diff options, Up: diff + +diff examples +------------- + + The following line produces a Unidiff (`-u' flag) between revision +1.14 and 1.19 of `backend.c'. Due to the `-kk' flag no keywords are +substituted, so differences that only depend on keyword substitution +are ignored. + + $ cvs diff -kk -u -r 1.14 -r 1.19 backend.c + + Suppose the experimental branch EXPR1 was based on a set of files +tagged RELEASE_1_0. To see what has happened on that branch, the +following can be used: + + $ cvs diff -r RELEASE_1_0 -r EXPR1 + + A command like this can be used to produce a context diff between +two releases: + + $ cvs diff -c -r RELEASE_1_0 -r RELEASE_1_1 > diffs + + If you are maintaining ChangeLogs, a command like the following just +before you commit your changes may help you write the ChangeLog entry. +All local modifications that have not yet been committed will be +printed. + + $ cvs diff -u | less + + +File: cvs.info, Node: export, Next: history, Prev: diff, Up: CVS commands + +export--Export sources from CVS, similar to checkout +==================================================== + + * Synopsis: export [-flNnR] [-r rev|-D date] [-k subst] [-d dir] + module... + + * Requires: repository. + + * Changes: current directory. + + This command is a variant of `checkout'; use it when you want a copy +of the source for module without the CVS administrative directories. +For example, you might use `export' to prepare source for shipment +off-site. This command requires that you specify a date or tag (with +`-D' or `-r'), so that you can count on reproducing the source you ship +to others. + + One often would like to use `-kv' with `cvs export'. This causes +any keywords to be expanded such that an import done at some other site +will not lose the keyword revision information. But be aware that +doesn't handle an export containing binary files correctly. Also be +aware that after having used `-kv', one can no longer use the `ident' +command (which is part of the RCS suite--see ident(1)) which looks for +keyword strings. If you want to be able to use `ident' you must not +use `-kv'. + +* Menu: + +* export options:: export options + + +File: cvs.info, Node: export options, Up: export + +export options +-------------- + + These standard options are supported by `export' (*note Common +options::., for a complete description of them): + +`-D DATE' + Use the most recent revision no later than DATE. + +`-f' + If no matching revision is found, retrieve the most recent + revision (instead of ignoring the file). + +`-l' + Local; run only in current working directory. + +`-n' + Do not run any checkout program. + +`-R' + Export directories recursively. This is on by default. + +`-r TAG' + Use revision TAG. + + In addition, these options (that are common to `checkout' and +`export') are also supported: + +`-d DIR' + Create a directory called DIR for the working files, instead of + using the module name. *Note checkout options::, for complete + details on how CVS handles this flag. + +`-k SUBST' + Set keyword expansion mode (*note Substitution modes::.). + +`-N' + Only useful together with `-d DIR'. *Note checkout options::, for + complete details on how CVS handles this flag. + + +File: cvs.info, Node: history, Next: import, Prev: export, Up: CVS commands + +history--Show status of files and users +======================================= + + * Synopsis: history [-report] [-flags] [-options args] [files...] + + * Requires: the file `$CVSROOT/CVSROOT/history' + + * Changes: nothing. + + CVS can keep a history file that tracks each use of the `checkout', +`commit', `rtag', `update', and `release' commands. You can use +`history' to display this information in various formats. + + Logging must be enabled by creating the file +`$CVSROOT/CVSROOT/history'. + + *Warning:* `history' uses `-f', `-l', `-n', and `-p' in ways that +conflict with the normal use inside CVS (*note Common options::.). + +* Menu: + +* history options:: history options + + +File: cvs.info, Node: history options, Up: history + +history options +--------------- + + Several options (shown above as `-report') control what kind of +report is generated: + +`-c' + Report on each time commit was used (i.e., each time the + repository was modified). + +`-e' + Everything (all record types). Equivalent to specifying `-x' with + all record types. Of course, `-e' will also include record types + which are added in a future version of CVS; if you are writing a + script which can only handle certain record types, you'll want to + specify `-x'. + +`-m MODULE' + Report on a particular module. (You can meaningfully use `-m' + more than once on the command line.) + +`-o' + Report on checked-out modules. + +`-T' + Report on all tags. + +`-x TYPE' + Extract a particular set of record types TYPE from the CVS + history. The types are indicated by single letters, which you may + specify in combination. + + Certain commands have a single record type: + + `F' + release + + `O' + checkout + + `E' + export + + `T' + rtag + + One of four record types may result from an update: + + `C' + A merge was necessary but collisions were detected (requiring + manual merging). + + `G' + A merge was necessary and it succeeded. + + `U' + A working file was copied from the repository. + + `W' + The working copy of a file was deleted during update (because + it was gone from the repository). + + One of three record types results from commit: + + `A' + A file was added for the first time. + + `M' + A file was modified. + + `R' + A file was removed. + + The options shown as `-flags' constrain or expand the report without +requiring option arguments: + +`-a' + Show data for all users (the default is to show data only for the + user executing `history'). + +`-l' + Show last modification only. + +`-w' + Show only the records for modifications done from the same working + directory where `history' is executing. + + The options shown as `-options ARGS' constrain the report based on +an argument: + +`-b STR' + Show data back to a record containing the string STR in either + the module name, the file name, or the repository path. + +`-D DATE' + Show data since DATE. This is slightly different from the normal + use of `-D DATE', which selects the newest revision older than + DATE. + +`-p REPOSITORY' + Show data for a particular source repository (you can specify + several `-p' options on the same command line). + +`-r REV' + Show records referring to revisions since the revision or tag + named REV appears in individual RCS files. Each RCS file is + searched for the revision or tag. + +`-t TAG' + Show records since tag TAG was last added to the history file. + This differs from the `-r' flag above in that it reads only the + history file, not the RCS files, and is much faster. + +`-u NAME' + Show records for user NAME. + + +File: cvs.info, Node: import, Next: log, Prev: history, Up: CVS commands + +import--Import sources into CVS, using vendor branches +====================================================== + + * Synopsis: import [-options] repository vendortag releasetag... + + * Requires: Repository, source distribution directory. + + * Changes: repository. + + Use `import' to incorporate an entire source distribution from an +outside source (e.g., a source vendor) into your source repository +directory. You can use this command both for initial creation of a +repository, and for wholesale updates to the module from the outside +source. *Note Tracking sources::, for a discussion on this subject. + + The REPOSITORY argument gives a directory name (or a path to a +directory) under the CVS root directory for repositories; if the +directory did not exist, import creates it. + + When you use import for updates to source that has been modified in +your source repository (since a prior import), it will notify you of +any files that conflict in the two branches of development; use +`checkout -j' to reconcile the differences, as import instructs you to +do. + + If CVS decides a file should be ignored (*note cvsignore::.), it +does not import it and prints `I ' followed by the filename (*note +import output::., for a complete description of the output). + + If the file `$CVSROOT/CVSROOT/cvswrappers' exists, any file whose +names match the specifications in that file will be treated as packages +and the appropriate filtering will be performed on the file/directory +before being imported. *Note Wrappers::. + + The outside source is saved in a first-level branch, by default +1.1.1. Updates are leaves of this branch; for example, files from the +first imported collection of source will be revision 1.1.1.1, then +files from the first imported update will be revision 1.1.1.2, and so +on. + + At least three arguments are required. REPOSITORY is needed to +identify the collection of source. VENDORTAG is a tag for the entire +branch (e.g., for 1.1.1). You must also specify at least one +RELEASETAG to identify the files at the leaves created each time you +execute `import'. + + Note that `import' does *not* change the directory in which you +invoke it. In particular, it does not set up that directory as a CVS +working directory; if you want to work with the sources import them +first and then check them out into a different directory (*note Getting +the source::.). + +* Menu: + +* import options:: import options +* import output:: import output +* import examples:: import examples + + File: cvs.info, Node: import options, Next: import output, Up: import import options @@ -323,11 +747,10 @@ options::., for a complete description of them): file was. `-u' - Use the unidiff format for the context diffs. This option is not - available if your `diff' does not support the unidiff format. - Remember that old versions of the `patch' program can't handle the - unidiff format, so if you plan to post this patch to the net you - should probably not use `-u'. + Use the unidiff format for the context diffs. Remember that old + versions of the `patch' program can't handle the unidiff format, + so if you plan to post this patch to the net you should probably + not use `-u'. `-V VN' Expand keywords according to the rules current in RCS version VN @@ -341,12 +764,13 @@ File: cvs.info, Node: rdiff examples, Prev: rdiff options, Up: rdiff rdiff examples -------------- - Suppose you receive mail from foo@bar.com asking for an update from -release 1.2 to 1.4 of the tc compiler. You have no such patches on -hand, but with CVS that can easily be fixed with a command such as this: + Suppose you receive mail from foo@example.net asking for an update +from release 1.2 to 1.4 of the tc compiler. You have no such patches +on hand, but with CVS that can easily be fixed with a command such as +this: $ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \ - $$ Mail -s 'The patches you asked for' foo@bar.com + $$ Mail -s 'The patches you asked for' foo@example.net Suppose you have made release 1.3, and forked a branch called `R_1_3fix' for bugfixes. `R_1_3_1' corresponds to release 1.3.1, which @@ -360,7 +784,7 @@ been done on the branch. This command can be used: File bar.h,v changed from revision 1.29.2.1 to 1.2 -File: cvs.info, Node: release, Next: rtag, Prev: rdiff, Up: CVS commands +File: cvs.info, Node: release, Next: update, Prev: rdiff, Up: CVS commands release--Indicate that a Module is no longer in use =================================================== @@ -460,184 +884,18 @@ File: cvs.info, Node: release examples, Prev: release output, Up: release release examples ---------------- - Release the module, and delete your local working copy of the files. + Release the `tc' directory, and delete your local working copy of +the files. $ cd .. # You must stand immediately above the # sources when you issue `cvs release'. $ cvs release -d tc You have [0] altered files in this repository. - Are you sure you want to release (and delete) module `tc': y + Are you sure you want to release (and delete) directory `tc': y $ -File: cvs.info, Node: rtag, Next: tag, Prev: release, Up: CVS commands - -rtag--Add a symbolic tag to a module -==================================== - - * rtag [-falnR] [-b] [-d] [-r tag | -Ddate] symbolic_tag modules... - - * Requires: repository. - - * Changes: repository. - - * Synonym: rfreeze - - You can use this command to assign symbolic tags to particular, -explicitly specified source revisions in the repository. `rtag' works -directly on the repository contents (and requires no prior checkout). -Use `tag' instead (*note tag::.), to base the selection of revisions on -the contents of your working directory. - - If you attempt to use a tag name that already exists, CVS will -complain and not overwrite that tag. Use the `-F' option to force the -new tag value. - -* Menu: - -* rtag options:: rtag options - - -File: cvs.info, Node: rtag options, Up: rtag - -rtag options ------------- - - These standard options are supported by `rtag' (*note Common -options::., for a complete description of them): - -`-D DATE' - Tag the most recent revision no later than DATE. - -`-f' - Only useful with the `-D DATE' or `-r TAG' flags. If no matching - revision is found, use the most recent revision (instead of - ignoring the file). - -`-F' - Overwrite an existing tag of the same name on a different revision. - -`-l' - Local; run only in current working directory. - -`-n' - Do not run any tag program that was specified with the `-t' flag - inside the `modules' file. (*note modules::.). - -`-R' - Tag directories recursively. This is on by default. - -`-r TAG' - Only tag those files that contain TAG. This can be used to rename - a tag: tag only the files identified by the old tag, then delete - the old tag, leaving the new tag on exactly the same files as the - old tag. - - In addition to the above common options, these options are available: - -`-a' - Use the `-a' option to have `rtag' look in the `Attic' (*note - Attic::.) for removed files that contain the specified tag. The - tag is removed from these files, which makes it convenient to - re-use a symbolic tag as development continues (and files get - removed from the up-coming distribution). - -`-b' - Make the tag a branch tag. *Note Branching and merging::. - -`-d' - Delete the tag instead of creating it. - - In general, tags (often the symbolic names of software - distributions) should not be removed, but the `-d' option is - available as a means to remove completely obsolete symbolic names - if necessary (as might be the case for an Alpha release, or if you - mistagged a module). - - -File: cvs.info, Node: tag, Next: update, Prev: rtag, Up: CVS commands - -tag--Add a symbolic tag to checked out versions of files -======================================================== - - * tag [-lR] [-b] [-c] [-d] symbolic_tag [files...] - - * Requires: working directory, repository. - - * Changes: repository. - - * Synonym: freeze - - Use this command to assign symbolic tags to the nearest repository -versions to your working sources. The tags are applied immediately to -the repository, as with `rtag', but the versions are supplied -implicitly by the CVS records of your working files' history rather than -applied explicitly. - - One use for tags is to record a snapshot of the current sources when -the software freeze date of a project arrives. As bugs are fixed after -the freeze date, only those changed sources that are to be part of the -release need be re-tagged. - - The symbolic tags are meant to permanently record which revisions of -which files were used in creating a software distribution. The -`checkout' and `update' commands allow you to extract an exact copy of -a tagged release at any time in the future, regardless of whether files -have been changed, added, or removed since the release was tagged. - - This command can also be used to delete a symbolic tag, or to create -a branch. See the options section below. - - If you attempt to use a tag name that already exists, CVS will -complain and not overwrite that tag. Use the `-F' option to force the -new tag value. - -* Menu: - -* tag options:: tag options - - -File: cvs.info, Node: tag options, Up: tag - -tag options ------------ - - These standard options are supported by `tag' (*note Common -options::., for a complete description of them): - -`-F' - Overwrite an existing tag of the same name on a different revision. - -`-l' - Local; run only in current working directory. - -`-R' - Tag directories recursively. This is on by default. - - Two special options are available: - -`-b' - Make the tag a branch tag (*note Branching and merging::.), - allowing concurrent, isolated development. This is most useful - for creating a patch to a previously released software - distribution. - -`-c' - Check that all files which are to be tagged are unmodified. This - can be used to make sure that you can reconstruct the current file - contents. - -`-d' - Delete a tag. - - If you use `cvs tag -d symbolic_tag', the symbolic tag you specify - is deleted instead of being added. Warning: Be very certain of - your ground before you delete a tag; doing this permanently - discards some historical information, which may later turn out to - be valuable. - - -File: cvs.info, Node: update, Prev: tag, Up: CVS commands +File: cvs.info, Node: update, Prev: release, Up: CVS commands update--Bring work tree in sync with repository =============================================== @@ -825,791 +1083,3 @@ status of the file: for CVS to ignore (see the description of the `-I' option, and *note cvsignore::.). - -File: cvs.info, Node: Invoking CVS, Next: Administrative files, Prev: CVS commands, Up: Top - -Quick reference to CVS commands -******************************* - - This appendix describes how to invoke CVS, with references to where -each command or feature is described in detail. For other references -run the `cvs --help' command, or see *Note Index::. - - A CVS command looks like: - - cvs [ GLOBAL_OPTIONS ] COMMAND [ COMMAND_OPTIONS ] [ COMMAND_ARGS ] - - Global options: - -`--allow-root=ROOTDIR' - Specify legal CVSROOT directory (server only) (not in CVS 1.9 and - older). See *Note Password authentication server::. - -`-a' - Authenticate all communication (client only) (not in CVS 1.9 and - older). See *Note Global options::. - -`-b' - Specify RCS location (CVS 1.9 and older). See *Note Global - options::. - -`-d ROOT' - Specify the CVSROOT. See *Note Repository::. - -`-e EDITOR' - Edit messages with EDITOR. See *Note Committing your changes::. - -`-f' - Do not read the `~/.cvsrc' file. See *Note Global options::. - -`-H' -`--help' - Print a help message. See *Note Global options::. - -`-l' - Do not log in CVSROOT/history file. See *Note Global options::. - -`-n' - Do not change any files. See *Note Global options::. - -`-Q' - Be really quiet. See *Note Global options::. - -`-q' - Be somewhat quiet. See *Note Global options::. - -`-r' - Make new working files read-only. See *Note Global options::. - -`-s VARIABLE=VALUE' - Set a user variable. See *Note Variables::. - -`-T TEMPDIR' - Put temporary files in TEMPDIR. See *Note Global options::. - -`-t' - Trace CVS execution. See *Note Global options::. - -`-v' -`--version' - Display version and copyright information for CVS. - -`-w' - Make new working files read-write. See *Note Global options::. - -`-x' - Encrypt all communication (client only). See *Note Global - options::. - -`-z GZIP-LEVEL' - Set the compression level (client only). - - Keyword expansion modes (*note Substitution modes::.): - - -kkv $Id: cvs.info-6,v 1.1.1.11 1998/08/22 20:57:44 tholo Exp $ - -kkvl $Id: cvs.info-6,v 1.1.1.11 1998/08/22 20:57:44 tholo Exp $ - -kk $Id: cvs.info-6,v 1.1.1.11 1998/08/22 20:57:44 tholo Exp $ - -kv file1,v 1.1 1993/12/09 03:21:13 joe Exp - -ko no expansion - -kb no expansion, file is binary - - Keywords (*note Keyword list::.): - - $Author: tholo $ - $Date: 1998/08/22 20:57:44 $ - $Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-6,v 1.1.1.11 1998/08/22 20:57:44 tholo Exp $ - $Id: cvs.info-6,v 1.1.1.11 1998/08/22 20:57:44 tholo Exp $ - $Locker: $ - $Name: $ - $RCSfile: cvs.info-6,v $ - $Revision: 1.1.1.11 $ - $Source: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-6,v $ - $State: Exp $ - $Log: cvs.info-6,v $ - Revision 1.1.1.11 1998/08/22 20:57:44 tholo - Latest version from Cyclic; skipped files - - Revision 1.1 1993/12/09 03:30:17 joe - Initial revision - - Commands, command options, and command arguments: - -`add [OPTIONS] [FILES...]' - Add a new file/directory. See *Note Adding files::. - - `-k KFLAG' - Set keyword expansion. - - `-m MSG' - Set file description. - -`admin [OPTIONS] [FILES...]' - Administration of history files in the repository. See *Note - admin::. - - `-b[REV]' - Set default branch. See *Note Reverting local changes::. - - `-cSTRING' - Set comment leader. - - `-kSUBST' - Set keyword substitution. See *Note Keyword substitution::. - - `-l[REV]' - Lock revision REV, or latest revision. - - `-mREV:MSG' - Replace the log message of revision REV with MSG. - - `-oRANGE' - Delete revisions from the repository. See *Note admin - options::. - - `-q' - Run quietly; do not print diagnostics. - - `-sSTATE[:REV]' - Set the state. - - `-t' - Set file description from standard input. - - `-tFILE' - Set file description from FILE. - - `-t-STRING' - Set file description to STRING. - - `-u[REV]' - Unlock revision REV, or latest revision. - -`annotate [OPTIONS] [FILES...]' - Show last revision where each line was modified. See *Note - annotate::. - - `-D DATE' - Annotate the most recent revision no later than DATE. See - *Note Common options::. - - `-f' - Use head revision if tag/date not found. See *Note Common - options::. - - `-l' - Local; run only in current working directory. *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Annotate revision TAG. See *Note Common options::. - -`checkout [OPTIONS] MODULES...' - Get a copy of the sources. See *Note checkout::. - - `-A' - Reset any sticky tags/date/options. See *Note Sticky tags:: - and *Note Keyword substitution::. - - `-c' - Output the module database. See *Note checkout options::. - - `-D DATE' - Check out revisions as of DATE (is sticky). See *Note Common - options::. - - `-d DIR' - Check out into DIR. See *Note checkout options::. - - `-f' - Use head revision if tag/date not found. See *Note Common - options::. - - `-j REV' - Merge in changes. See *Note checkout options::. - - `-k KFLAG' - Use KFLAG keyword expansion. See *Note Substitution modes::. - - `-l' - Local; run only in current working directory. *Note - Recursive behavior::. - - `-N' - Don't "shorten" module paths if -d specified. See *Note - checkout options::. - - `-n' - Do not run module program (if any). See *Note checkout - options::. - - `-P' - Prune empty directories. See *Note Moving directories::. - - `-p' - Check out files to standard output (avoids stickiness). See - *Note checkout options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Checkout revision TAG (is sticky). See *Note Common - options::. - - `-s' - Like -c, but include module status. See *Note checkout - options::. - -`commit [OPTIONS] [FILES...]' - Check changes into the repository. See *Note commit::. - - `-F FILE' - Read log message from FILE. See *Note commit options::. - - `-f' - Force the file to be committed; disables recursion. See - *Note commit options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-m MSG' - Use MSG as log message. See *Note commit options::. - - `-n' - Do not run module program (if any). See *Note commit - options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r REV' - Commit to REV. See *Note commit options::. - -`diff [OPTIONS] [FILES...]' - Show differences between revisions. See *Note diff::. In - addition to the options shown below, accepts a wide variety of - options to control output style, for example `-c' for context - diffs. - - `-D DATE1' - Diff revision for date against working file. See *Note diff - options::. - - `-D DATE2' - Diff REV1/DATE1 against DATE2. See *Note diff options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-N' - Include diffs for added and removed files. See *Note diff - options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r REV1' - Diff revision for REV1 against working file. See *Note diff - options::. - - `-r REV2' - Diff REV1/DATE1 against REV2. See *Note diff options::. - -`edit [OPTIONS] [FILES...]' - Get ready to edit a watched file. See *Note Editing files::. - - `-a ACTIONS' - Specify actions for temporary watch, where ACTIONS is `edit', - `unedit', `commit', `all', or `none'. See *Note Editing - files::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - -`editors [OPTIONS] [FILES...]' - See who is editing a watched file. See *Note Watch information::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - -`export [OPTIONS] MODULES...' - Export files from CVS. See *Note export::. - - `-D DATE' - Check out revisions as of DATE. See *Note Common options::. - - `-d DIR' - Check out into DIR. See *Note export options::. - - `-f' - Use head revision if tag/date not found. See *Note Common - options::. - - `-k KFLAG' - Use KFLAG keyword expansion. See *Note Substitution modes::. - - `-l' - Local; run only in current working directory. *Note - Recursive behavior::. - - `-N' - Don't "shorten" module paths if -d specified. See *Note - export options::. - - `-n' - Do not run module program (if any). See *Note export - options::. - - `-P' - Prune empty directories. See *Note Moving directories::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Checkout revision TAG (is sticky). See *Note Common - options::. - -`history [OPTIONS] [FILES...]' - Show repository access history. See *Note history::. - - `-a' - All users (default is self). See *Note history options::. - - `-b STR' - Back to record with STR in module/file/repos field. See - *Note history options::. - - `-c' - Report on committed (modified) files. See *Note history - options::. - - `-D DATE' - Since DATE. See *Note history options::. - - `-e' - Report on all record types. See *Note history options::. - - `-l' - Last modified (committed or modified report). See *Note - history options::. - - `-m MODULE' - Report on MODULE (repeatable). See *Note history options::. - - `-n MODULE' - In MODULE. See *Note history options::. - - `-o' - Report on checked out modules. See *Note history options::. - - `-r REV' - Since revision REV. See *Note history options::. - - `-T' - Produce report on all TAGs. See *Note history options::. - - `-t TAG' - Since tag record placed in history file (by anyone). See - *Note history options::. - - `-u USER' - For user USER (repeatable). See *Note history options::. - - `-w' - Working directory must match. See *Note history options::. - - `-x TYPES' - Report on TYPES, one or more of `TOEFWUCGMAR'. See *Note - history options::. - - `-z ZONE' - Output for time zone ZONE. See *Note history options::. - -`import [OPTIONS] REPOSITORY VENDOR-TAG RELEASE-TAGS...' - Import files into CVS, using vendor branches. See *Note import::. - - `-b BRA' - Import to vendor branch BRA. See *Note Multiple vendor - branches::. - - `-d' - Use the file's modification time as the time of import. See - *Note import options::. - - `-k KFLAG' - Set default keyword substitution mode. See *Note import - options::. - - `-m MSG' - Use MSG for log message. See *Note import options::. - - `-I IGN' - More files to ignore (! to reset). See *Note import - options::. - - `-W SPEC' - More wrappers. See *Note import options::. - -`init' - Create a CVS repository if it doesn't exist. See *Note Creating a - repository::. - -`log [OPTIONS] [FILES...]' - Print out history information for files. See *Note log::. - - `-b' - Only list revisions on the default branch. See *Note log - options::. - - `-d DATES' - Specify dates (D1<D2 for range, D for latest before). See - *Note log options::. - - `-h' - Only print header. See *Note log options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-N' - Do not list tags. See *Note log options::. - - `-R' - Only print name of RCS file. See *Note log options::. - - `-rREVS' - Only list revisions REVS. See *Note log options::. - - `-s STATES' - Only list revisions with specified states. See *Note log - options::. - - `-t' - Only print header and descriptive text. See *Note log - options::. - - `-wLOGINS' - Only list revisions checked in by specified logins. See - *Note log options::. - -`login' - Prompt for password for authenticating server. See *Note Password - authentication client::. - -`logout' - Remove stored password for authenticating server. See *Note - Password authentication client::. - -`rdiff [OPTIONS] MODULES...' - Show differences between releases. See *Note rdiff::. - - `-c' - Context diff output format (default). See *Note rdiff - options::. - - `-D DATE' - Select revisions based on DATE. See *Note Common options::. - - `-f' - Use head revision if tag/date not found. See *Note Common - options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r REV' - Select revisions based on REV. See *Note Common options::. - - `-s' - Short patch - one liner per file. See *Note rdiff options::. - - `-t' - Top two diffs - last change made to the file. See *Note diff - options::. - - `-u' - Unidiff output format. See *Note rdiff options::. - - `-V VERS' - Use RCS Version VERS for keyword expansion (obsolete). See - *Note rdiff options::. - -`release [OPTIONS] DIRECTORY' - Indicate that a directory is no longer in use. See *Note - release::. - - `-d' - Delete the given directory. See *Note release options::. - -`remove [OPTIONS] [FILES...]' - Remove an entry from the repository. See *Note Removing files::. - - `-f' - Delete the file before removing it. See *Note Removing - files::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - -`rtag [OPTIONS] TAG MODULES...' - Add a symbolic tag to a module. See *Note rtag::. - - `-a' - Clear tag from removed files that would not otherwise be - tagged. See *Note rtag options::. - - `-b' - Create a branch named TAG. See *Note rtag options::. - - `-D DATE' - Tag revisions as of DATE. See *Note rtag options::. - - `-d' - Delete the given tag. See *Note rtag options::. - - `-F' - Move tag if it already exists. See *Note rtag options::. - - `-f' - Force a head revision match if tag/date not found. See *Note - rtag options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-n' - No execution of tag program. See *Note rtag options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Tag existing tag TAG. See *Note rtag options::. - -`status [OPTIONS] FILES...' - Display status information in a working directory. See *Note File - status::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-v' - Include tag information for file. See *Note Tags::. - -`tag [OPTIONS] TAG [FILES...]' - Add a symbolic tag to checked out version of files. See *Note - tag::. - - `-b' - Create a branch named TAG. See *Note tag options::. - - `-D DATE' - Tag revisions as of DATE. See *Note tag options::. - - `-d' - Delete the given tag. See *Note tag options::. - - `-F' - Move tag if it already exists. See *Note tag options::. - - `-f' - Force a head revision match if tag/date not found. See *Note - tag options::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-n' - No execution of tag program. See *Note tag options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Tag existing tag TAG. See *Note tag options::. - -`unedit [OPTIONS] [FILES...]' - Undo an edit command. See *Note Editing files::. - - `-a ACTIONS' - Specify actions for temporary watch, where ACTIONS is `edit', - `unedit', `commit', `all', or `none'. See *Note Editing - files::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - -`update [OPTIONS] [FILES...]' - Bring work tree in sync with repository. See *Note update::. - - `-A' - Reset any sticky tags/date/options. See *Note Sticky tags:: - and *Note Keyword substitution::. - - `-D DATE' - Check out revisions as of DATE (is sticky). See *Note Common - options::. - - `-d' - Create directories. See *Note update options::. - - `-f' - Use head revision if tag/date not found. See *Note Common - options::. - - `-I IGN' - More files to ignore (! to reset). See *Note import - options::. - - `-j REV' - Merge in changes. See *Note update options::. - - `-k KFLAG' - Use KFLAG keyword expansion. See *Note Substitution modes::. - - `-l' - Local; run only in current working directory. *Note - Recursive behavior::. - - `-P' - Prune empty directories. See *Note Moving directories::. - - `-p' - Check out files to standard output (avoids stickiness). See - *Note update options::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - `-r TAG' - Checkout revision TAG (is sticky). See *Note Common - options::. - - `-W SPEC' - More wrappers. See *Note import options::. - -`watch [on|off|add|remove] [OPTIONS] [FILES...]' - on/off: turn on/off read-only checkouts of files. See *Note - Setting a watch::. - - add/remove: add or remove notification on actions. See *Note - Getting Notified::. - - `-a ACTIONS' - Specify actions for temporary watch, where ACTIONS is `edit', - `unedit', `commit', `all', or `none'. See *Note Editing - files::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - -`watchers [OPTIONS] [FILES...]' - See who is watching a file. See *Note Watch information::. - - `-l' - Local; run only in current working directory. See *Note - Recursive behavior::. - - `-R' - Operate recursively (default). *Note Recursive behavior::. - - -File: cvs.info, Node: Administrative files, Next: Environment variables, Prev: Invoking CVS, Up: Top - -Reference manual for Administrative files -***************************************** - - Inside the repository, in the directory `$CVSROOT/CVSROOT', there -are a number of supportive files for CVS. You can use CVS in a limited -fashion without any of them, but if they are set up properly they can -help make life easier. For a discussion of how to edit them, see *Note -Intro administrative files::. - - The most important of these files is the `modules' file, which -defines the modules inside the repository. - -* Menu: - -* modules:: Defining modules -* Wrappers:: Treat directories as files -* commit files:: The commit support files -* commitinfo:: Pre-commit checking -* verifymsg:: How are log messages evaluated? -* editinfo:: Specifying how log messages are created - (obsolete) -* loginfo:: Where should log messages be sent? -* rcsinfo:: Templates for the log messages -* cvsignore:: Ignoring files via cvsignore -* history file:: History information -* Variables:: Various variables are expanded -* config:: Miscellaneous CVS configuration - - -File: cvs.info, Node: modules, Next: Wrappers, Up: Administrative files - -The modules file -================ - - The `modules' file records your definitions of names for collections -of source code. CVS will use these definitions if you use CVS to -update the modules file (use normal commands like `add', `commit', etc). - - The `modules' file may contain blank lines and comments (lines -beginning with `#') as well as module definitions. Long lines can be -continued on the next line by specifying a backslash (`\') as the last -character on the line. - - There are three basic types of modules: alias modules, regular -modules, and ampersand modules. The difference between them is the way -that they map files in the repository to files in the working -directory. In all of the following examples, the top-level repository -contains a directory called `first-dir', which contains two files, -`file1' and `file2', and a directory `sdir'. `first-dir/sdir' contains -a file `sfile'. - -* Menu: - -* Alias modules:: The simplest kind of module -* Regular modules:: -* Ampersand modules:: -* Excluding directories:: Excluding directories from a module -* Module options:: Regular and ampersand modules can take options - |