{ "content": [ { "type": "text", "text": "# cvs (man)\n\n## NAME\n\ncvs - Concurrent Versions System\n\n## SYNOPSIS\n\ncvs [ cvsoptions ]\ncvscommand [ commandoptions ] [ commandargs ]\n\n## TLDR\n\n> Concurrent Versions System, a revision control system.\n\n- Create a new repository (requires the `$CVSROOT` environment variable to be set externally):\n `cvs -d {{path/to/repository}} init`\n- Add a project to the repository:\n `cvs import -m \"{{message}}\" {{project_name}} {{version}} {{vendor}}`\n- Checkout a project:\n `cvs checkout {{project_name}}`\n- Show changes made to files:\n `cvs diff {{path/to/file}}`\n- Add a file:\n `cvs add {{path/to/file}}`\n- Commit a file:\n `cvs commit -m \"{{message}}\" {{path/to/file}}`\n- Update the working directory from the remote repository:\n `cvs update`\n\n*Source: tldr-pages*\n\n## Sections\n\n- **NAME**\n- **SYNOPSIS**\n- **NOTE** (2 subsections)\n- **Structure** (266 subsections)\n- **AUTHORS**\n- **SEE ALSO**\n\nUse structuredContent.sections for detailed options, examples, and full documentation.\n" } ], "structuredContent": { "command": "cvs", "section": "", "mode": "man", "summary": "cvs - Concurrent Versions System", "synopsis": "cvs [ cvsoptions ]\ncvscommand [ commandoptions ] [ commandargs ]", "tldr_summary": "Concurrent Versions System, a revision control system.", "tldr_examples": [ { "description": "Create a new repository (requires the `$CVSROOT` environment variable to be set externally)", "command": "cvs -d {{path/to/repository}} init" }, { "description": "Add a project to the repository", "command": "cvs import -m \"{{message}}\" {{project_name}} {{version}} {{vendor}}" }, { "description": "Checkout a project", "command": "cvs checkout {{project_name}}" }, { "description": "Show changes made to files", "command": "cvs diff {{path/to/file}}" }, { "description": "Add a file", "command": "cvs add {{path/to/file}}" }, { "description": "Commit a file", "command": "cvs commit -m \"{{message}}\" {{path/to/file}}" }, { "description": "Update the working directory from the remote repository", "command": "cvs update" } ], "tldr_source": "official", "flags": [ { "flag": "-a", "long": null, "arg": null, "description": "Authenticate all communication between the client and the server. Only has an effect on the cvs client. As of this writing, this is only implemented when using a GSSAPI connec‐ tion (see node 'GSSAPI authenticated' in the CVS manual). Authentication prevents certain sorts of attacks involving hijacking the active tcp connection. Enabling authentication does not enable encryption." }, { "flag": "-b", "long": null, "arg": null, "description": "In cvs 1.9.18 and older, this specified that rcs programs are in the bindir directory. Current versions of cvs do not run rcs programs; for compatibility this option is accepted, but it does nothing." }, { "flag": "-T", "long": null, "arg": null, "description": "Use tempdir as the directory where temporary files are located. The cvs client and server store temporary files in a temporary directory. The path to this temporary directory is set via, in order of precedence: • The argument to the global -T option. • The value set for TmpDir in the config file (server only - see node 'config' in the CVS manual). • The contents of the $TMPDIR environment variable (%TMPDIR% on Windows - see node 'Envi‐ ronment variables' in the CVS manual). • /tmp Temporary directories should always be specified as an absolute pathname. When running a CVS client, -T affects only the local process; specifying -T for the client has no effect on the server and vice versa." }, { "flag": "-d", "long": null, "arg": null, "description": "Use cvsrootdirectory as the root directory pathname of the repository. Overrides the setting of the $CVSROOT environment variable. See node 'Repository' in the CVS manual." }, { "flag": "-e", "long": null, "arg": null, "description": "Use editor to enter revision log information. Overrides the setting of the $CVSEDITOR and $EDITOR environment variables. For more information, see node 'Committing your changes' in the CVS manual." }, { "flag": "-f", "long": null, "arg": null, "description": "Do not read the ~/.cvsrc file. This option is most often used because of the non-orthogo‐ nality of the cvs option set. For example, the cvs log option -N (turn off display of tag names) does not have a corresponding option to turn the display on. So if you have -N in the ~/.cvsrc entry for log, you may need to use -f to show the tag names." }, { "flag": "-g", "long": null, "arg": null, "description": "Forges group-writable permissions on files in the working copy. This option is typically used when you have multiple users sharing a single checked out source tree, allowing them to operate their shells with a less dangerous umask at the expense of cvs security. To use this feature, create a directory to hold the checked-out source tree, set it to a private group, and set up the directory such that files created under it inherit the gid of the di‐ rectory. On BSD systems, this occurs automatically. On SYSV systems and GNU/Linux, the sgid bit must be set on the directory for this. The users who are to share the checked out tree must be placed in that group which owns the directory. Note that the sharing of a single checked-out source tree is very different from giving several users access to a common cvs repository. Access to a common cvs repository already maintains shared group-write permissions and does not require this option. Due to the security implications, setting this option globally in your .cvsrc file is strongly discouraged; if you must, ensure all source checkouts are \"firewalled\" within a private group or a private mode 0700 directory. This option is a MidnightBSD extension merged into Debian and MirBSD cvs." }, { "flag": "-H", "long": null, "arg": null, "description": "" }, { "flag": "", "long": "--help", "arg": null, "description": "Display usage information about the specified cvscommand (but do not actually execute the command). If you don't specify a command name, cvs -H displays overall help for cvs, in‐ cluding a list of other help options." }, { "flag": "-R", "long": null, "arg": null, "description": "Turns on read-only repository mode. This allows one to check out from a read-only reposi‐ tory, such as within an anoncvs server, or from a cd-rom repository. Same effect as if the CVSREADONLYFS environment variable is set. Using -R can also consid‐ erably speed up checkouts over NFS." }, { "flag": "-n", "long": null, "arg": null, "description": "Do not change any files. Attempt to execute the cvscommand, but only to issue reports; do not remove, update, or merge any existing files, or create any new files. Note that cvs will not necessarily produce exactly the same output as without -n. In some cases the output will be the same, but in other cases cvs will skip some of the processing that would have been required to produce the exact same output." }, { "flag": "-Q", "long": null, "arg": null, "description": "Cause the command to be really quiet; the command will only generate output for serious problems." }, { "flag": "-q", "long": null, "arg": null, "description": "Cause the command to be somewhat quiet; informational messages, such as reports of recur‐ sion through subdirectories, are suppressed." }, { "flag": "-r", "long": null, "arg": null, "description": "Make new working files read-only. Same effect as if the $CVSREAD environment variable is set (see node 'Environment variables' in the CVS manual). The default is to make working files writable, unless watches are on (see node 'Watches' in the CVS manual)." }, { "flag": "-s", "long": null, "arg": null, "description": "Set a user variable (see node 'Variables' in the CVS manual)." }, { "flag": "-t", "long": null, "arg": null, "description": "Trace program execution; display messages showing the steps of cvs activity. Particularly useful with -n to explore the potential impact of an unfamiliar command." }, { "flag": "-v", "long": null, "arg": null, "description": "" }, { "flag": "", "long": "--version", "arg": null, "description": "Display version and copyright information for cvs." }, { "flag": "-w", "long": null, "arg": null, "description": "Make new working files read-write. Overrides the setting of the $CVSREAD environment vari‐ able. Files are created read-write by default, unless $CVSREAD is set or -r is given." }, { "flag": "-x", "long": null, "arg": null, "description": "Encrypt all communication between the client and the server. Only has an effect on the cvs client. As of this writing, this is only implemented when using a GSSAPI connection (see node 'GSSAPI authenticated' in the CVS manual) or a Kerberos connection (see node 'Kerberos authenticated' in the CVS manual). Enabling encryption implies that message traffic is also authenticated. Encryption support is not available by default; it must be enabled us‐ ing a special configure option, --enable-encryption, when you build cvs." }, { "flag": "-z", "long": null, "arg": null, "description": "Request compression level for network traffic. cvs interprets level identically to the gzip program. Valid levels are 1 (high speed, low compression) to 9 (low speed, high com‐ pression), or 0 to disable compression (the default). Data sent to the server will be com‐ pressed at the requested level and the client will request the server use the same compres‐ sion level for data returned. The server will use the closest level allowed by the server administrator to compress returned data. This option only has an effect when passed to the cvs client." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than datespec. datespec is a single argument, a date description specifying a date in the past. The specification is sticky when you use it to make a private copy of a source file; that is, when you get a working file using -D, cvs records the date you specified, so that fur‐ ther updates in the same directory will use the same date (for more information on sticky tags/dates, see node 'Sticky tags' in the CVS manual). -D is available with the annotate, checkout, diff, export, history, ls, rdiff, rls, rtag, tag, and update commands. (The history command uses this option in a slightly different way; see node 'history options' in the CVS manual). For a complete description of the date formats accepted by cvs, see node 'Date input for‐ mats' in the CVS manual. Remember to quote the argument to the -D flag so that your shell doesn't interpret spaces as argument separators. A command using the -D flag can look like this: $ cvs diff -D \"1 hour ago\" cvs.texinfo" }, { "flag": "-f", "long": null, "arg": null, "description": "When you specify a particular date or tag to cvs commands, they normally ignore files that do not contain the tag (or did not exist prior to the date) that you specified. Use the -f option if you want files retrieved even when there is no match for the tag or date. (The most recent revision of the file will be used). Note that even with -f, a tag that you specify must exist (that is, in some file, not nec‐ essary in every file). This is so that cvs will continue to give an error if you mistype a tag name. -f is available with these commands: annotate, checkout, export, rdiff, rtag, and update. WARNING: The commit and remove commands also have a -f option, but it has a different be‐ havior for those commands. See node 'commit options' in the CVS manual, and node 'Removing files' in the CVS manual." }, { "flag": "-k", "long": null, "arg": null, "description": "Override the default processing of RCS keywords other than -kb. See node 'Keyword substi‐ tution' in the CVS manual, for the meaning of kflag. Used with the checkout and update commands, your kflag specification is sticky; that is, when you use this option with a checkout or update command, cvs associates your selected kflag with any files it operates on, and continues to use that kflag with future commands on the same files until you spec‐ ify otherwise. The -k option is available with the add, checkout, diff, export, import, rdiff, and update commands. WARNING: Prior to CVS version 1.12.2, the -k flag overrode the -kb indication for a binary file. This could sometimes corrupt binary files. See node 'Merging and keywords' in the CVS manual, for more." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory, rather than recursing through subdirectories. Available with the following commands: annotate, checkout, commit, diff, edit, editors, ex‐‐ port, log, rdiff, remove, rtag, status, tag, unedit, update, watch, and watchers." }, { "flag": "-m", "long": null, "arg": null, "description": "Use message as log information, instead of invoking an editor. Available with the following commands: add, commit and import." }, { "flag": "-n", "long": null, "arg": null, "description": "Do not run any tag program. (A program can be specified to run in the modules database (see node 'modules' in the CVS manual); this option bypasses it). Note: this is not the same as the cvs -n program option, which you can specify to the left of a cvs command! Available with the checkout, commit, export, and rtag commands." }, { "flag": "-P", "long": null, "arg": null, "description": "Prune empty directories. See node 'Removing directories' in the CVS manual." }, { "flag": "-p", "long": null, "arg": null, "description": "Pipe the files retrieved from the repository to standard output, rather than writing them in the current directory. Available with the checkout and update commands." }, { "flag": "-R", "long": null, "arg": null, "description": "Process directories recursively. This is the default for all cvs commands, with the excep‐ tion of ls & rls. Available with the following commands: annotate, checkout, commit, diff, edit, editors, ex‐‐ port, ls, rdiff, remove, rls, rtag, status, tag, unedit, update, watch, and watchers." }, { "flag": "-r", "long": null, "arg": null, "description": "" }, { "flag": "-r", "long": null, "arg": null, "description": "Use the revision specified by the tag argument (and the date argument for the commands which accept it) instead of the default head revision. As well as arbitrary tags defined with the tag or rtag command, two special tags are always available: HEAD refers to the most recent version available in the repository (also known as the tip of the MAIN branch, also known as trunk; the name of a branch refers to its tip; this version of cvs introduces .bhead, but only for the diff command, for the same), and BASE refers to the revision you last checked out into the current working directory. The tag specification is sticky when you use this with checkout or update to make your own copy of a file: cvs remembers the tag and continues to use it on future update commands, until you specify otherwise (for more information on sticky tags/dates, see node 'Sticky tags' in the CVS manual). The tag can be either a symbolic or numeric tag, as described in node 'Tags' in the CVS manual, or the name of a branch, as described in node 'Branching and merging' in the CVS manual. When tag is the name of a branch, some commands accept the optional date argument to specify the revision as of the given date on the branch. When a command expects a spe‐ cific revision, the name of a branch is interpreted as the most recent revision on that branch. As a Debian and MirBSD cvs extension, specifying BASE as the date portion of the argument yields the base revision of the branch specified by the tag portion of the argument, i.e. the revision on the parent branch the tag branch split off, or, where both branches were the same. This option has not received very much testing, beware! Specifying the -q global option along with the -r command option is often useful, to sup‐ press the warning messages when the rcs file does not contain the specified tag. Note: this is not the same as the overall cvs -r option, which you can specify to the left of a cvs command! -r tag is available with the commit and history commands. -r tag[:date] is available with the annotate, checkout, diff, export, rdiff, rtag, and up‐‐ date commands." }, { "flag": "-W", "long": null, "arg": null, "description": "Specify file names that should be filtered. You can use this option repeatedly. The spec can be a file name pattern of the same type that you can specify in the .cvswrappers file. Available with the following commands: import, and update." }, { "flag": "-A", "long": null, "arg": null, "description": "Might not work together with cvs. Append the access list of oldfile to the access list of the rcs file." }, { "flag": "-a", "long": null, "arg": null, "description": "Might not work together with cvs. Append the login names appearing in the comma-separated list logins to the access list of the rcs file." }, { "flag": "-c", "long": null, "arg": null, "description": "Sets the comment leader to string. The comment leader is not used by current versions of cvs or rcs 5.7. Therefore, you can almost surely not worry about it. See node 'Keyword substitution' in the CVS manual." }, { "flag": "-I", "long": null, "arg": null, "description": "Run interactively, even if the standard input is not a terminal. This option does not work with the client/server cvs and is likely to disappear in a future release of cvs." }, { "flag": "-i", "long": null, "arg": null, "description": "Useless with cvs. This creates and initialises a new rcs file, without depositing a revi‐ sion. With cvs, add files with the cvs add command (see node 'Adding files' in the CVS manual)." }, { "flag": "-k", "long": null, "arg": null, "description": "Set the default keyword substitution to subst. See node 'Keyword substitution' in the CVS manual. Giving an explicit -k option to cvs update, cvs export, or cvs checkout overrides this default." }, { "flag": "-L", "long": null, "arg": null, "description": "Set locking to strict. Strict locking means that the owner of an RCS file is not exempt from locking for checkin. For use with cvs, strict locking must be set; see the discussion under the -l option above." }, { "flag": "-m", "long": null, "arg": null, "description": "Replace the log message of revision rev with msg." }, { "flag": "-N", "long": null, "arg": null, "description": "Act like -n, except override any previous assignment of name. For use with magic branches, see node 'Magic branch numbers' in the CVS manual." }, { "flag": "-n", "long": null, "arg": null, "description": "Associate the symbolic name name with the branch or revision rev. It is normally better to use cvs tag or cvs rtag instead. Delete the symbolic name if both : and rev are omitted; otherwise, print an error message if name is already associated with another number. If rev is symbolic, it is expanded before association. A rev consisting of a branch number followed by a . stands for the current latest revision in the branch. A : with an empty rev stands for the current latest revision on the default branch, normally the trunk. For example, cvs admin -nname: associates name with the current latest revision of all the RCS files; this contrasts with cvs admin -nname:$ which associates name with the revision num‐ bers extracted from keyword strings in the corresponding working files." }, { "flag": "-o", "long": null, "arg": null, "description": "Deletes (outdates) the revisions given by range. Note that this command can be quite dangerous unless you know exactly what you are doing (for example see the warnings below about how the rev1:rev2 syntax is confusing). If you are short on disc this option might help you. But think twice before using it—there is no way short of restoring the latest backup to undo this command! If you delete differ‐ ent revisions than you planned, either due to carelessness or (heaven forbid) a cvs bug, there is no opportunity to correct the error before the revisions are deleted. It probably would be a good idea to experiment on a copy of the repository first. Specify range in one of the following ways: rev1::rev2 Collapse all revisions between rev1 and rev2, so that cvs only stores the differences as‐ sociated with going from rev1 to rev2, not intermediate steps. For example, after -o 1.3::1.5 one can retrieve revision 1.3, revision 1.5, or the differences to get from 1.3 to 1.5, but not the revision 1.4, or the differences between 1.3 and 1.4. Other exam‐ ples: -o 1.3::1.4 and -o 1.3::1.3 have no effect, because there are no intermediate revi‐ sions to remove. ::rev Collapse revisions between the beginning of the branch containing rev and rev itself. The branchpoint and rev are left intact. For example, -o ::1.3.2.6 deletes revision 1.3.2.1, revision 1.3.2.5, and everything in between, but leaves 1.3 and 1.3.2.6 intact. rev:: Collapse revisions between rev and the end of the branch containing rev. Revision rev is left intact but the head revision is deleted. rev Delete the revision rev. For example, -o 1.3 is equivalent to -o 1.2::1.4. rev1:rev2 Delete the revisions from rev1 to rev2, inclusive, on the same branch. One will not be able to retrieve rev1 or rev2 or any of the revisions in between. For example, the com‐ mand cvs admin -oR101:R102 . is rarely useful. It means to delete revisions up to, and including, the tag R102. But beware! If there are files that have not changed be‐ tween R102 and R103 the file will have the same numerical revision number assigned to the tags R102 and R103. So not only will it be impossible to retrieve R102; R103 will also have to be restored from the tapes! In most cases you want to specify rev1::rev2 instead. :rev Delete revisions from the beginning of the branch containing rev up to and including rev. rev: Delete revisions from revision rev, including rev itself, to the end of the branch con‐ taining rev. None of the revisions to be deleted may have branches or locks. If any of the revisions to be deleted have symbolic names, and one specifies one of the :: syntaxes, then cvs will give an error and not delete any revisions. If you really want to delete both the symbolic names and the revisions, first delete the symbolic names with cvs tag -d, then run cvs admin -o. If one specifies the non-:: syntaxes, then cvs will delete the revisions but leave the symbolic names pointing to nonexistent revisions. This behavior is preserved for compatibility with previous versions of cvs, but because it isn't very useful, in the future it may change to be like the :: case. Due to the way cvs handles branches rev cannot be specified symbolically if it is a branch. See node 'Magic branch numbers' in the CVS manual, for an explanation. Make sure that no-one has checked out a copy of the revision you outdate. Strange things will happen if he starts to edit it and tries to check it back in. For this reason, this option is not a good way to take back a bogus commit; commit a new revision undoing the bogus change instead (see node 'Merging two revisions' in the CVS manual)." }, { "flag": "-q", "long": null, "arg": null, "description": "Run quietly; do not print diagnostics." }, { "flag": "-s", "long": null, "arg": null, "description": "Useful with cvs. Set the state attribute of the revision rev to state. If rev is a branch number, assume the latest revision on that branch. If rev is omitted, assume the latest revision on the default branch. Any identifier is acceptable for state. A useful set of states is Exp (for experimental), Stab (for stable), and Rel (for released). By default, the state of a new revision is set to Exp when it is created. The state is visible in the output from cvs log (see node 'log' in the CVS manual), and in the $Log$ and $State$ key‐ words (see node 'Keyword substitution' in the CVS manual). Note that cvs uses the dead state for its own purposes (see node 'Attic' in the CVS manual); to take a file to or from the dead state use commands like cvs remove and cvs add (see node 'Adding and removing' in the CVS manual), not cvs admin -s." }, { "flag": "-U", "long": null, "arg": null, "description": "Set locking to non-strict. Non-strict locking means that the owner of a file need not lock a revision for checkin. For use with cvs, strict locking must be set; see the discussion under the -l option above." }, { "flag": "-V", "long": null, "arg": null, "description": "In previous versions of cvs, this option meant to write an rcs file which would be accept‐ able to rcs version n, but it is now obsolete and specifying it will produce an error." }, { "flag": "-x", "long": null, "arg": null, "description": "In previous versions of cvs, this was documented as a way of specifying the names of the rcs files. However, cvs has always required that the rcs files used by cvs end in ,v, so this option has never done anything useful." }, { "flag": "-b", "long": null, "arg": null, "description": "Backwards, show when a line was removed. Currently appears to be broken." }, { "flag": "-l", "long": null, "arg": null, "description": "Local directory only, no recursion." }, { "flag": "-R", "long": null, "arg": null, "description": "Process directories recursively." }, { "flag": "-f", "long": null, "arg": null, "description": "Use head revision if tag/date not found." }, { "flag": "-F", "long": null, "arg": null, "description": "Annotate binary files." }, { "flag": "-r", "long": null, "arg": null, "description": "Annotate file as of specified revision/tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. See node 'Common options' in the CVS manual." }, { "flag": "-D", "long": null, "arg": null, "description": "Annotate file as of specified date." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than date. This option is sticky, and implies -P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates." }, { "flag": "-f", "long": null, "arg": null, "description": "Only useful with the -D or -r flags. If no matching revision is found, retrieve the most recent revision (instead of ignoring the file)." }, { "flag": "-k", "long": null, "arg": null, "description": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual. This option is sticky; future updates of this file in this working directory will use the same kflag. The status command can be viewed to see the sticky options. See node 'Invok‐ ing CVS' in the CVS manual, for more information on the status command." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory." }, { "flag": "-n", "long": null, "arg": null, "description": "Do not run any checkout program (as specified with the -o option in the modules file; see node 'modules' in the CVS manual)." }, { "flag": "-P", "long": null, "arg": null, "description": "Prune empty directories. See node 'Moving directories' in the CVS manual." }, { "flag": "-p", "long": null, "arg": null, "description": "Pipe files to the standard output." }, { "flag": "-R", "long": null, "arg": null, "description": "Checkout directories recursively. This option is on by default." }, { "flag": "-r", "long": null, "arg": null, "description": "Checkout the revision specified by tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. This option is sticky, and implies -P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates. Also, see node 'Common options' in the CVS manual. In addition to those, you can use these special command options with checkout:" }, { "flag": "-A", "long": null, "arg": null, "description": "Reset any sticky tags, dates, or -k options. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates." }, { "flag": "-c", "long": null, "arg": null, "description": "Copy the module file, sorted, to the standard output, instead of creating or modifying any files or directories in your working directory." }, { "flag": "-d", "long": null, "arg": null, "description": "Create a directory called dir for the working files, instead of using the module name. In general, using this flag is equivalent to using mkdir dir; cd dir followed by the checkout command without the -d flag. There is an important exception, however. It is very convenient when checking out a single item to have the output appear in a directory that doesn't contain empty intermediate di‐ rectories. In this case only, cvs tries to ``shorten'' pathnames to avoid those empty di‐ rectories. For example, given a module foo that contains the file bar.c, the command cvs co -d dir foo will create directory dir and place bar.c inside. Similarly, given a module bar which has subdirectory baz wherein there is a file quux.c, the command cvs co -d dir bar/baz will create directory dir and place quux.c inside. Using the -N flag will defeat this behavior. Given the same module definitions above, cvs co -N -d dir foo will create directories dir/foo and place bar.c inside, while cvs co -N -d dir bar/baz will create directories dir/bar/baz and place quux.c inside." }, { "flag": "-j", "long": null, "arg": null, "description": "With two -j options, merge changes from the revision specified with the first -j option to the revision specified with the second j option, into the working directory. With one -j option, merge changes from the ancestor revision to the revision specified with the -j option, into the working directory. The ancestor revision is the common ancestor of the revision which the working directory is based on, and the revision specified in the -j option. In addition, each -j option can contain an optional date specification which, when used with branches, can limit the chosen revision to one within a specific date. An optional date is specified by adding a colon (:) to the tag: -jSymbolicTag:DateSpecifier. See node 'Branching and merging' in the CVS manual." }, { "flag": "-N", "long": null, "arg": null, "description": "Only useful together with -d dir. With this option, cvs will not ``shorten'' module paths in your working directory when you check out a single module. See the -d flag for examples and a discussion." }, { "flag": "-s", "long": null, "arg": null, "description": "Like -c, but include the status of all modules, and sort it by the status string. See node 'modules' in the CVS manual, for info about the -s option that is used inside the modules file to set the module status." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory." }, { "flag": "-R", "long": null, "arg": null, "description": "Commit directories recursively. This is on by default." }, { "flag": "-r", "long": null, "arg": null, "description": "Commit to revision. revision must be either a branch, or a revision on the main trunk that is higher than any existing revision number (see node 'Assigning revisions' in the CVS man‐ ual). You cannot commit to a specific revision on a branch. commit also supports these options:" }, { "flag": "-c", "long": null, "arg": null, "description": "Refuse to commit files unless the user has registered a valid edit on the file via cvs edit. This is most useful when commit -c and edit -c have been placed in all .cvsrc files. A commit can be forced anyways by either regestering an edit retroactively via cvs edit (no changes to the file will be lost) or using the -f option to commit. Support for commit -c requires both client and a server versions 1.12.10 or greater." }, { "flag": "-F", "long": null, "arg": null, "description": "Read the log message from file, instead of invoking an editor." }, { "flag": "-f", "long": null, "arg": null, "description": "Note that this is not the standard behavior of the -f option as defined in node 'Common op‐ tions' in the CVS manual. Force cvs to commit a new revision even if you haven't made any changes to the file. As of cvs version 1.12.10, it also causes the -c option to be ignored. If the current revision of file is 1.7, then the following two commands are equivalent: $ cvs commit -f file $ cvs commit -r 1.8 file The -f option disables recursion (i.e., it implies -l). To force cvs to commit a new revi‐ sion for all files in all subdirectories, you must use -f -R." }, { "flag": "-m", "long": null, "arg": null, "description": "Use message as the log message, instead of invoking an editor." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than date. See -r for how this affects the compari‐ son." }, { "flag": "-k", "long": null, "arg": null, "description": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory." }, { "flag": "-R", "long": null, "arg": null, "description": "Examine directories recursively. This option is on by default." }, { "flag": "-r", "long": null, "arg": null, "description": "Compare with revision specified by tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. 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. Most options have two equivalent names, one of which is a single letter preceded by -, and the other of which is a long name preceded by --. -lines Show lines (an integer) lines of context. This option does not specify an output format by itself; it has no effect unless it is combined with -c or -u. This option is obsolete. For proper operation, patch typically needs at least two lines of context." }, { "flag": "-a", "long": null, "arg": null, "description": "Treat all files as text and compare them line-by-line, even if they do not seem to be text." }, { "flag": "-b", "long": null, "arg": null, "description": "Ignore trailing white space and consider all other sequences of one or more white space characters to be equivalent." }, { "flag": "-B", "long": null, "arg": null, "description": "Ignore changes that just insert or delete blank lines." }, { "flag": "", "long": "--binary", "arg": null, "description": "Read and write data in binary mode." }, { "flag": "", "long": "--brief", "arg": null, "description": "Report only whether the files differ, not the details of the differences." }, { "flag": "-c", "long": null, "arg": null, "description": "Use the context output format." }, { "flag": "-C", "long": null, "arg": null, "description": "--context[=lines] Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of con‐ text. --changed-group-format=format Use format to output a line group containing differing lines from both files in if-then-else format. See node 'Line group formats' in the CVS manual." }, { "flag": "-d", "long": null, "arg": null, "description": "Change the algorithm to perhaps find a smaller set of changes. This makes diff slower (sometimes much slower)." }, { "flag": "-e", "long": null, "arg": null, "description": "" }, { "flag": "", "long": "--ed", "arg": null, "description": "Make output that is a valid ed script." }, { "flag": "", "long": "--expand-tabs", "arg": null, "description": "Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files." }, { "flag": "-f", "long": null, "arg": null, "description": "Make output that looks vaguely like an ed script but has changes in the order they appear in the file." }, { "flag": "-F", "long": null, "arg": null, "description": "In context and unified format, for each hunk of differences, show some of the last preced‐ ing line that matches regexp." }, { "flag": "", "long": "--forward-ed", "arg": null, "description": "Make output that looks vaguely like an ed script but has changes in the order they appear in the file." }, { "flag": "-H", "long": null, "arg": null, "description": "Use heuristics to speed handling of large files that have numerous scattered small changes. --horizon-lines=lines Do not discard the last lines lines of the common prefix and the first lines lines of the common suffix." }, { "flag": "-i", "long": null, "arg": null, "description": "Ignore changes in case; consider upper- and lower-case letters equivalent." }, { "flag": "-I", "long": null, "arg": null, "description": "Ignore changes that just insert or delete lines that match regexp. --ifdef=name Make merged if-then-else output using name." }, { "flag": "", "long": "--ignore-all-space", "arg": null, "description": "Ignore white space when comparing lines." }, { "flag": "", "long": "--ignore-blank-lines", "arg": null, "description": "Ignore changes that just insert or delete blank lines." }, { "flag": "", "long": "--ignore-case", "arg": null, "description": "Ignore changes in case; consider upper- and lower-case to be the same. --ignore-matching-lines=regexp Ignore changes that just insert or delete lines that match regexp." }, { "flag": "", "long": "--ignore-space-change", "arg": null, "description": "Ignore trailing white space and consider all other sequences of one or more white space characters to be equivalent." }, { "flag": "", "long": "--initial-tab", "arg": null, "description": "Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal." }, { "flag": "-L", "long": null, "arg": null, "description": "Use label instead of the file name in the context format and unified format headers. --label=label Use label instead of the file name in the context format and unified format headers." }, { "flag": "", "long": "--left-column", "arg": null, "description": "Print only the left column of two common lines in side by side format. --line-format=format Use format to output all input lines in if-then-else format. See node 'Line formats' in the CVS manual." }, { "flag": "", "long": "--minimal", "arg": null, "description": "Change the algorithm to perhaps find a smaller set of changes. This makes diff slower (sometimes much slower)." }, { "flag": "-n", "long": null, "arg": null, "description": "Output RCS-format diffs; like -f except that each command specifies the number of lines af‐ fected." }, { "flag": "-N", "long": null, "arg": null, "description": "" }, { "flag": "", "long": "--new-file", "arg": null, "description": "In directory comparison, if a file is found in only one directory, treat it as present but empty in the other directory. --new-group-format=format Use format to output a group of lines taken from just the second file in if-then-else for‐ mat. See node 'Line group formats' in the CVS manual. --new-line-format=format Use format to output a line taken from just the second file in if-then-else format. See node 'Line formats' in the CVS manual. --old-group-format=format Use format to output a group of lines taken from just the first file in if-then-else for‐ mat. See node 'Line group formats' in the CVS manual. --old-line-format=format Use format to output a line taken from just the first file in if-then-else format. See node 'Line formats' in the CVS manual." }, { "flag": "-p", "long": null, "arg": null, "description": "Show which C function each change is in." }, { "flag": "", "long": "--rcs", "arg": null, "description": "Output RCS-format diffs; like -f except that each command specifies the number of lines af‐ fected." }, { "flag": "", "long": "--report-identical-files", "arg": null, "description": "" }, { "flag": "-s", "long": null, "arg": null, "description": "Report when two files are the same." }, { "flag": "", "long": "--show-c-function", "arg": null, "description": "Show which C function each change is in. --show-function-line=regexp In context and unified format, for each hunk of differences, show some of the last preced‐ ing line that matches regexp." }, { "flag": "", "long": "--side-by-side", "arg": null, "description": "Use the side by side output format." }, { "flag": "", "long": "--speed-large-files", "arg": null, "description": "Use heuristics to speed handling of large files that have numerous scattered small changes." }, { "flag": "", "long": "--suppress-common-lines", "arg": null, "description": "Do not print common lines in side by side format." }, { "flag": "-t", "long": null, "arg": null, "description": "Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files." }, { "flag": "-T", "long": null, "arg": null, "description": "Output a tab rather than a space before the text of a line in normal or context format. This causes the alignment of tabs in the line to look normal." }, { "flag": "", "long": "--text", "arg": null, "description": "Treat all files as text and compare them line-by-line, even if they do not appear to be text." }, { "flag": "-u", "long": null, "arg": null, "description": "Use the unified output format. --unchanged-group-format=format Use format to output a group of common lines taken from both files in if-then-else format. See node 'Line group formats' in the CVS manual. --unchanged-line-format=format Use format to output a line common to both files in if-then-else format. See node 'Line formats' in the CVS manual." }, { "flag": "-U", "long": null, "arg": null, "description": "--unified[=lines] Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch typically needs at least two lines of con‐ text." }, { "flag": "-w", "long": null, "arg": null, "description": "Ignore white space when comparing lines." }, { "flag": "-W", "long": null, "arg": null, "description": "--width=columns Use an output width of columns in side by side format." }, { "flag": "-y", "long": null, "arg": null, "description": "Use the side by side output format." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than date." }, { "flag": "-f", "long": null, "arg": null, "description": "If no matching revision is found, retrieve the most recent revision (instead of ignoring the file)." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory." }, { "flag": "-n", "long": null, "arg": null, "description": "Do not run any checkout program." }, { "flag": "-R", "long": null, "arg": null, "description": "Export directories recursively. This is on by default." }, { "flag": "-r", "long": null, "arg": null, "description": "Export the revision specified by tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. See node 'Common options' in the CVS manual. In addition, these options (that are common to checkout and export) are also supported:" }, { "flag": "-d", "long": null, "arg": null, "description": "Create a directory called dir for the working files, instead of using the module name. See node 'checkout options' in the CVS manual, for complete details on how cvs handles this flag." }, { "flag": "-k", "long": null, "arg": null, "description": "Set keyword expansion mode (see node 'Substitution modes' in the CVS manual)." }, { "flag": "-N", "long": null, "arg": null, "description": "Only useful together with -d dir. See node 'checkout options' in the CVS manual, for com‐ plete details on how cvs handles this flag." }, { "flag": "-c", "long": null, "arg": null, "description": "Report on each time commit was used (i.e., each time the repository was modified)." }, { "flag": "-e", "long": null, "arg": null, "description": "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." }, { "flag": "-m", "long": null, "arg": null, "description": "Report on a particular module. (You can meaningfully use -m more than once on the command line.)" }, { "flag": "-o", "long": null, "arg": null, "description": "Report on checked-out modules. This is the default report type." }, { "flag": "-T", "long": null, "arg": null, "description": "Report on all tags." }, { "flag": "-x", "long": null, "arg": null, "description": "Extract a particular set of record types type from the cvs history. The types are indi‐ cated 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 five 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. P A working file was patched to match the repository. W The working copy of a file was deleted during update (because it was gone from the repos‐ itory). 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 argu‐ ments:" }, { "flag": "-a", "long": null, "arg": null, "description": "Show data for all users (the default is to show data only for the user executing history)." }, { "flag": "-l", "long": null, "arg": null, "description": "Show last modification only." }, { "flag": "-w", "long": null, "arg": null, "description": "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:" }, { "flag": "-b", "long": null, "arg": null, "description": "Show data back to a record containing the string str in either the module name, the file name, or the repository path." }, { "flag": "-D", "long": null, "arg": null, "description": "Show data since date. This is slightly different from the normal use of -D date, which se‐ lects the newest revision older than date." }, { "flag": "-f", "long": null, "arg": null, "description": "Show data for a particular file (you can specify several -f options on the same command line). This is equivalent to specifying the file on the command line." }, { "flag": "-n", "long": null, "arg": null, "description": "Show data for a particular module (you can specify several -n options on the same command line)." }, { "flag": "-p", "long": null, "arg": null, "description": "Show data for a particular source repository (you can specify several -p options on the same command line)." }, { "flag": "-r", "long": null, "arg": null, "description": "Show records referring to revisions since the revision or tag named rev appears in individ‐ ual rcs files. Each rcs file is searched for the revision or tag." }, { "flag": "-t", "long": null, "arg": null, "description": "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." }, { "flag": "-u", "long": null, "arg": null, "description": "Show records for user name." }, { "flag": "-z", "long": null, "arg": null, "description": "Show times in the selected records using the specified time zone instead of UTC." }, { "flag": "-m", "long": null, "arg": null, "description": "Use message as log information, instead of invoking an editor. There are the following additional special options." }, { "flag": "-b", "long": null, "arg": null, "description": "See node 'Multiple vendor branches' in the CVS manual." }, { "flag": "-k", "long": null, "arg": null, "description": "Indicate the keyword expansion mode desired. This setting will apply to all files created during the import, but not to any files that previously existed in the repository. See node 'Substitution modes' in the CVS manual, for a list of valid -k settings." }, { "flag": "-I", "long": null, "arg": null, "description": "Specify file names that should be ignored during import. You can use this option repeat‐ edly. To avoid ignoring any files at all (even those ignored by default), specify `-I !'. name can be a file name pattern of the same type that you can specify in the .cvsignore file. See node 'cvsignore' in the CVS manual." }, { "flag": "-W", "long": null, "arg": null, "description": "Specify file names that should be filtered during import. You can use this option repeat‐ edly. spec can be a file name pattern of the same type that you can specify in the .cvswrappers file. See node 'Wrappers' in the CVS manual." }, { "flag": "-X", "long": null, "arg": null, "description": "Modify the algorithm used by cvs when importing new files so that new files do not immedi‐ ately appear on the main trunk. Specifically, this flag causes cvs to mark new files as if they were deleted on the main trunk, by taking the following steps for each file in addition to those normally taken on import: creating a new revision on the main trunk indicating that the new file is dead, re‐ setting the new file's default branch, and placing the file in the Attic (see node 'Attic' in the CVS manual) directory. Setting the ImportNewFilesToVendorBranchOnly option in CVSROOT/config (see node 'config' in the CVS manual) forces use of this option on a repository-wide basis." }, { "flag": "-b", "long": null, "arg": null, "description": "Print information about the revisions on the default branch, normally the highest branch on the trunk." }, { "flag": "-d", "long": null, "arg": null, "description": "Print information about revisions with a checkin date/time in the range given by the semi‐ colon-separated list of dates. The date formats accepted are those accepted by the -D op‐ tion to many other cvs commands (see node 'Common options' in the CVS manual). Dates can be combined into ranges as follows: d1d1 Select the revisions that were deposited between d1 and d2. Select all revisions dated d or earlier. d< >d Select all revisions dated d or later. d Select the single, latest revision dated d or earlier. The > or < characters may be followed by = to indicate an inclusive range rather than an exclusive one. Note that the separator is a semicolon (;)." }, { "flag": "-h", "long": null, "arg": null, "description": "Print only the name of the rcs file, name of the file in the working directory, head, de‐ fault branch, access list, locks, symbolic names, and suffix." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory. (Default is to run recursively)." }, { "flag": "-N", "long": null, "arg": null, "description": "Do not print the list of tags for this file. This option can be very useful when your site uses a lot of tags, so rather than \"more\"'ing over 3 pages of tag information, the log in‐ formation is presented without tags at all." }, { "flag": "-R", "long": null, "arg": null, "description": "Print only the name of the rcs file." }, { "flag": "-r", "long": null, "arg": null, "description": "Print information about revisions given in the comma-separated list revisions of revisions and ranges. The following table explains the available range formats: rev1:rev2 Revisions rev1 to rev2 (which must be on the same branch). rev1::rev2 The same, but excluding rev1. :rev ::rev Revisions from the beginning of the branch up to and including rev. rev: Revisions starting with rev to the end of the branch containing rev. rev:: Revisions starting just after rev to the end of the branch containing rev. branch An argument that is a branch means all revisions on that branch. branch1:branch2 branch1::branch2 A range of branches means all revisions on the branches in that range. branch. The latest revision in branch. A bare -r with no revisions means the latest revision on the default branch, normally the trunk. There can be no space between the -r option and its argument." }, { "flag": "-S", "long": null, "arg": null, "description": "Suppress the header if no revisions are selected." }, { "flag": "-s", "long": null, "arg": null, "description": "Print information about revisions whose state attributes match one of the states given in the comma-separated list states. Individual states may be any text string, though cvs com‐ monly only uses two states, Exp and dead. See node 'admin options' in the CVS manual for more information." }, { "flag": "-t", "long": null, "arg": null, "description": "Print the same as -h, plus the descriptive text." }, { "flag": "-w", "long": null, "arg": null, "description": "Print information about revisions checked in by users with login names appearing in the comma-separated list logins. If logins is omitted, the user's login is assumed. There can be no space between the -w option and its argument. log prints the intersection of the revisions selected with the options -d, -s, and -w, in‐ tersected with the union of the revisions selected by -b and -r." }, { "flag": "-d", "long": null, "arg": null, "description": "Show dead revisions (with tag when specified)." }, { "flag": "-e", "long": null, "arg": null, "description": "Display in CVS/Entries format. This format is meant to remain easily parsable by automa‐ tion." }, { "flag": "-l", "long": null, "arg": null, "description": "Display all details." }, { "flag": "-P", "long": null, "arg": null, "description": "Don't list contents of empty directories when recursing." }, { "flag": "-R", "long": null, "arg": null, "description": "List recursively." }, { "flag": "-r", "long": null, "arg": null, "description": "Show files specified by tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. See node 'Common options' in the CVS manual." }, { "flag": "-D", "long": null, "arg": null, "description": "Show files from date." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than date." }, { "flag": "-f", "long": null, "arg": null, "description": "If no matching revision is found, retrieve the most recent revision (instead of ignoring the file)." }, { "flag": "-k", "long": null, "arg": null, "description": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; don't descend subdirectories." }, { "flag": "-R", "long": null, "arg": null, "description": "Examine directories recursively. This option is on by default." }, { "flag": "-r", "long": null, "arg": null, "description": "Use the revision specified by tag, or when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. See node 'Common options' in the CVS manual. In addition to the above, these options are available:" }, { "flag": "-c", "long": null, "arg": null, "description": "Use the context diff format. This is the default format." }, { "flag": "-p", "long": null, "arg": null, "description": "Show which C function each change is in." }, { "flag": "-s", "long": null, "arg": null, "description": "Create a summary change report instead of a patch. The summary includes information about files that were changed or added between the releases. It is sent to the standard output device. This is useful for finding out, for example, which files have changed between two dates or revisions." }, { "flag": "-t", "long": null, "arg": null, "description": "A diff of the top two revisions is sent to the standard output device. This is most useful for seeing what the last change to a file was." }, { "flag": "-u", "long": null, "arg": null, "description": "Use the unidiff format for the context diffs. Remember that old versions of the patch pro‐ gram can't handle the unidiff format, so if you plan to post this patch to the net you should probably not use -u." }, { "flag": "-V", "long": null, "arg": null, "description": "Expand keywords according to the rules current in rcs version vn (the expansion format changed with rcs version 5). Note that this option is no longer accepted. cvs will always expand keywords the way that rcs version 5 does." }, { "flag": "-d", "long": null, "arg": null, "description": "Delete your working copy of the file if the release succeeds. If this flag is not given your files will remain in your working directory. WARNING: The release command deletes all directories and files recursively. This has the very serious side-effect that any directory that you have created inside your checked-out sources, and not added to the repository (using the add command; see node 'Adding files' in the CVS manual) will be silently deleted—even if it is non-empty!" }, { "flag": "-c", "long": null, "arg": null, "description": "Load configuration from the given path rather than from the default location $CVSROOT/CVS‐‐ ROOT/config (see node 'config' in the CVS manual). path must be /etc/cvs.conf or prefixed by /etc/cvs/. This option is supported beginning with cvs release 1.12.13." }, { "flag": "-D", "long": null, "arg": null, "description": "Use the most recent revision no later than date. This option is sticky, and implies -P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates." }, { "flag": "-f", "long": null, "arg": null, "description": "Only useful with the -D or -r flags. If no matching revision is found, retrieve the most recent revision (instead of ignoring the file)." }, { "flag": "-k", "long": null, "arg": null, "description": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual. This option is sticky; future updates of this file in this working directory will use the same kflag. The status command can be viewed to see the sticky options. See node 'Invok‐ ing CVS' in the CVS manual, for more information on the status command." }, { "flag": "-l", "long": null, "arg": null, "description": "Local; run only in current working directory. See node 'Recursive behavior' in the CVS manual." }, { "flag": "-P", "long": null, "arg": null, "description": "Prune empty directories. See node 'Moving directories' in the CVS manual." }, { "flag": "-p", "long": null, "arg": null, "description": "Pipe files to the standard output." }, { "flag": "-R", "long": null, "arg": null, "description": "Update directories recursively (default). See node 'Recursive behavior' in the CVS manual." }, { "flag": "-r", "long": null, "arg": null, "description": "Retrieve the revisions specified by tag or, when date is specified and tag is a branch tag, the version from the branch tag as it existed on date. This option is sticky, and implies -P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates. Also see node 'Common options' in the CVS manual. These special options are also available with update." }, { "flag": "-A", "long": null, "arg": null, "description": "Reset any sticky tags, dates, or -k options. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates." }, { "flag": "-C", "long": null, "arg": null, "description": "Overwrite locally modified files with clean copies from the repository (the modified file is saved in .#file.revision, however)." }, { "flag": "-d", "long": null, "arg": null, "description": "Create any directories that exist in the repository if they're missing from the working di‐ rectory. Normally, update acts only on directories and files that were already enrolled in your working directory. This is useful for updating directories that were created in the repository since the ini‐ tial checkout; but it has an unfortunate side effect. If you deliberately avoided certain directories in the repository when you created your working directory (either through use of a module name or by listing explicitly the files and directories you wanted on the com‐ mand line), then updating with -d will create those directories, which may not be what you want." }, { "flag": "-I", "long": null, "arg": null, "description": "Ignore files whose names match name (in your working directory) during the update. You can specify -I more than once on the command line to specify several files to ignore. Use -I ! to avoid ignoring any files at all. See node 'cvsignore' in the CVS manual, for other ways to make cvs ignore some files." }, { "flag": "-W", "long": null, "arg": null, "description": "Specify file names that should be filtered during update. You can use this option repeat‐ edly. spec can be a file name pattern of the same type that you can specify in the .cvswrappers file. See node 'Wrappers' in the CVS manual." }, { "flag": "-j", "long": null, "arg": null, "description": "With two -j options, merge changes from the revision specified with the first -j option to the revision specified with the second j option, into the working directory. With one -j option, merge changes from the ancestor revision to the revision specified with the -j option, into the working directory. The ancestor revision is the common ancestor of the revision which the working directory is based on, and the revision specified in the -j option. Note that using a single -j tagname option rather than -j branchname to merge changes from a branch will often not remove files which were removed on the branch. See node 'Merging adds and removals' in the CVS manual, for more. In addition, each -j option can contain an optional date specification which, when used with branches, can limit the chosen revision to one within a specific date. An optional date is specified by adding a colon (:) to the tag: -jSymbolicTag:DateSpecifier. See node 'Branching and merging' in the CVS manual." } ], "examples": [], "see_also": [ { "name": "ci", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/ci/1/json" }, { "name": "co", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/co/1/json" }, { "name": "cvsbug", "section": "8", "url": "https://www.chedong.com/phpMan.php/man/cvsbug/8/json" }, { "name": "diff", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/diff/1/json" }, { "name": "grep", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/grep/1/json" }, { "name": "patch", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/patch/1/json" }, { "name": "rcs", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/rcs/1/json" }, { "name": "rcsdiff", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/rcsdiff/1/json" }, { "name": "tro", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/tro/1/json" }, { "name": "rcsmerge", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/rcsmerge/1/json" }, { "name": "rlog", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/rlog/1/json" }, { "name": "reformat", "section": "7", "url": "https://www.chedong.com/phpMan.php/man/reformat/7/json" }, { "name": "CVS", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/CVS/1/json" } ], "section_outline": [ { "name": "NAME", "lines": 2, "subsections": [] }, { "name": "SYNOPSIS", "lines": 3, "subsections": [] }, { "name": "NOTE", "lines": 52, "subsections": [ { "name": "CVS commands", "lines": 1 }, { "name": "Guide to CVS commands", "lines": 6 } ] }, { "name": "Structure", "lines": 1, "subsections": [ { "name": "Overall structure of CVS commands", "lines": 10 }, { "name": "cvs", "lines": 36 }, { "name": "Exit status", "lines": 1 }, { "name": "CVS's exit status", "lines": 14 }, { "name": "Default options and the ~/.cvsrc file", "lines": 49 }, { "name": "Global options", "lines": 13 }, { "name": "-a", "lines": 8, "flag": "-a" }, { "name": "-b", "lines": 6, "flag": "-b" }, { "name": "-T", "lines": 26, "flag": "-T" }, { "name": "-d", "lines": 5, "flag": "-d" }, { "name": "-e", "lines": 6, "flag": "-e" }, { "name": "-f", "lines": 7, "flag": "-f" }, { "name": "-g", "lines": 21, "flag": "-g" }, { "name": "-H", "lines": 1, "flag": "-H" }, { "name": "--help", "lines": 6, "long": "--help" }, { "name": "-R", "lines": 8, "flag": "-R" }, { "name": "-n", "lines": 9, "flag": "-n" }, { "name": "-Q", "lines": 5, "flag": "-Q" }, { "name": "-q", "lines": 5, "flag": "-q" }, { "name": "-r", "lines": 6, "flag": "-r" }, { "name": "-s", "lines": 4, "flag": "-s" }, { "name": "-t", "lines": 5, "flag": "-t" }, { "name": "-v", "lines": 1, "flag": "-v" }, { "name": "--version", "lines": 4, "long": "--version" }, { "name": "-w", "lines": 5, "flag": "-w" }, { "name": "-x", "lines": 9, "flag": "-x" }, { "name": "-z", "lines": 9, "flag": "-z" }, { "name": "Common options", "lines": 1 }, { "name": "Common command options", "lines": 12 }, { "name": "-D", "lines": 26, "flag": "-D" }, { "name": "-f", "lines": 17, "flag": "-f" }, { "name": "-k", "lines": 16, "flag": "-k" }, { "name": "-l", "lines": 7, "flag": "-l" }, { "name": "-m", "lines": 6, "flag": "-m" }, { "name": "-n", "lines": 10, "flag": "-n" }, { "name": "-P", "lines": 4, "flag": "-P" }, { "name": "-p", "lines": 5, "flag": "-p" }, { "name": "-R", "lines": 8, "flag": "-R" }, { "name": "-r", "lines": 1, "flag": "-r" }, { "name": "-r", "lines": 38, "flag": "-r" }, { "name": "-W", "lines": 6, "flag": "-W" }, { "name": "admin, annotate, Date input formats, CVS commands", "lines": 22 }, { "name": "admin options", "lines": 5 }, { "name": "-A", "lines": 5, "flag": "-A" }, { "name": "-a", "lines": 5, "flag": "-a" }, { "name": "-b[", "lines": 8 }, { "name": "-c", "lines": 6, "flag": "-c" }, { "name": "-e[", "lines": 6 }, { "name": "-I", "lines": 5, "flag": "-I" }, { "name": "-i", "lines": 6, "flag": "-i" }, { "name": "-k", "lines": 6, "flag": "-k" }, { "name": "-l[", "lines": 12 }, { "name": "-L", "lines": 6, "flag": "-L" }, { "name": "-m", "lines": 4, "flag": "-m" }, { "name": "-N", "lines": 5, "flag": "-N" }, { "name": "-n", "lines": 12, "flag": "-n" }, { "name": "-o", "lines": 84, "flag": "-o" }, { "name": "-q", "lines": 4, "flag": "-q" }, { "name": "-s", "lines": 13, "flag": "-s" }, { "name": "-t[", "lines": 10 }, { "name": "-t-", "lines": 5 }, { "name": "-U", "lines": 6, "flag": "-U" }, { "name": "-u[", "lines": 9 }, { "name": "-V", "lines": 5, "flag": "-V" }, { "name": "-x", "lines": 6, "flag": "-x" }, { "name": "annotate, checkout, admin, CVS commands", "lines": 15 }, { "name": "annotate options", "lines": 5 }, { "name": "-b", "lines": 4, "flag": "-b" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-f", "lines": 4, "flag": "-f" }, { "name": "-F", "lines": 4, "flag": "-F" }, { "name": "-r", "lines": 6, "flag": "-r" }, { "name": "-D", "lines": 3, "flag": "-D" }, { "name": "annotate example", "lines": 22 }, { "name": "checkout, commit, annotate, CVS commands", "lines": 46 }, { "name": "checkout options", "lines": 5 }, { "name": "-D", "lines": 5, "flag": "-D" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-k", "lines": 7, "flag": "-k" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-n", "lines": 5, "flag": "-n" }, { "name": "-P", "lines": 4, "flag": "-P" }, { "name": "-p", "lines": 4, "flag": "-p" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 9, "flag": "-r" }, { "name": "-A", "lines": 5, "flag": "-A" }, { "name": "-c", "lines": 5, "flag": "-c" }, { "name": "-d", "lines": 20, "flag": "-d" }, { "name": "-j", "lines": 16, "flag": "-j" }, { "name": "-N", "lines": 6, "flag": "-N" }, { "name": "-s", "lines": 5, "flag": "-s" }, { "name": "checkout examples", "lines": 17 }, { "name": "commit, diff, checkout, CVS commands", "lines": 39 }, { "name": "commit options", "lines": 5 }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 8, "flag": "-r" }, { "name": "-c", "lines": 8, "flag": "-c" }, { "name": "-F", "lines": 4, "flag": "-F" }, { "name": "-f", "lines": 19, "flag": "-f" }, { "name": "-m", "lines": 3, "flag": "-m" }, { "name": "commit examples", "lines": 1 }, { "name": "Committing to a branch", "lines": 22 }, { "name": "Creating the branch after editing", "lines": 40 }, { "name": "diff, export, commit, CVS commands", "lines": 19 }, { "name": "diff options", "lines": 5 }, { "name": "-D", "lines": 5, "flag": "-D" }, { "name": "-k", "lines": 4, "flag": "-k" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 23, "flag": "-r" }, { "name": "-a", "lines": 4, "flag": "-a" }, { "name": "-b", "lines": 5, "flag": "-b" }, { "name": "-B", "lines": 4, "flag": "-B" }, { "name": "--binary", "lines": 4, "long": "--binary" }, { "name": "--brief", "lines": 4, "long": "--brief" }, { "name": "-c", "lines": 4, "flag": "-c" }, { "name": "-C", "lines": 15, "flag": "-C" }, { "name": "-d", "lines": 5, "flag": "-d" }, { "name": "-e", "lines": 1, "flag": "-e" }, { "name": "--ed", "lines": 4, "long": "--ed" }, { "name": "--expand-tabs", "lines": 4, "long": "--expand-tabs" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-F", "lines": 5, "flag": "-F" }, { "name": "--forward-ed", "lines": 5, "long": "--forward-ed" }, { "name": "-H", "lines": 11, "flag": "-H" }, { "name": "-i", "lines": 4, "flag": "-i" }, { "name": "-I", "lines": 10, "flag": "-I" }, { "name": "--ignore-all-space", "lines": 4, "long": "--ignore-all-space" }, { "name": "--ignore-blank-lines", "lines": 4, "long": "--ignore-blank-lines" }, { "name": "--ignore-case", "lines": 10, "long": "--ignore-case" }, { "name": "--ignore-space-change", "lines": 5, "long": "--ignore-space-change" }, { "name": "--initial-tab", "lines": 5, "long": "--initial-tab" }, { "name": "-L", "lines": 10, "flag": "-L" }, { "name": "--left-column", "lines": 11, "long": "--left-column" }, { "name": "--minimal", "lines": 5, "long": "--minimal" }, { "name": "-n", "lines": 5, "flag": "-n" }, { "name": "-N", "lines": 1, "flag": "-N" }, { "name": "--new-file", "lines": 33, "long": "--new-file" }, { "name": "-p", "lines": 4, "flag": "-p" }, { "name": "--rcs", "lines": 5, "long": "--rcs" }, { "name": "--report-identical-files", "lines": 1, "long": "--report-identical-files" }, { "name": "-s", "lines": 4, "flag": "-s" }, { "name": "--show-c-function", "lines": 11, "long": "--show-c-function" }, { "name": "--side-by-side", "lines": 4, "long": "--side-by-side" }, { "name": "--speed-large-files", "lines": 4, "long": "--speed-large-files" }, { "name": "--suppress-common-lines", "lines": 4, "long": "--suppress-common-lines" }, { "name": "-t", "lines": 4, "flag": "-t" }, { "name": "-T", "lines": 5, "flag": "-T" }, { "name": "--text", "lines": 5, "long": "--text" }, { "name": "-u", "lines": 18, "flag": "-u" }, { "name": "-U", "lines": 8, "flag": "-U" }, { "name": "-w", "lines": 4, "flag": "-w" }, { "name": "-W", "lines": 6, "flag": "-W" }, { "name": "-y", "lines": 3, "flag": "-y" }, { "name": "Line group formats", "lines": 210 }, { "name": "Line formats", "lines": 135 }, { "name": "diff examples", "lines": 38 }, { "name": "export, history, diff, CVS commands", "lines": 21 }, { "name": "export options", "lines": 5 }, { "name": "-D", "lines": 4, "flag": "-D" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-n", "lines": 4, "flag": "-n" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 8, "flag": "-r" }, { "name": "-d", "lines": 6, "flag": "-d" }, { "name": "-k", "lines": 4, "flag": "-k" }, { "name": "-N", "lines": 4, "flag": "-N" }, { "name": "history, import, export, CVS commands", "lines": 27 }, { "name": "history options", "lines": 4 }, { "name": "-c", "lines": 4, "flag": "-c" }, { "name": "-e", "lines": 7, "flag": "-e" }, { "name": "-m", "lines": 5, "flag": "-m" }, { "name": "-o", "lines": 4, "flag": "-o" }, { "name": "-T", "lines": 4, "flag": "-T" }, { "name": "-x", "lines": 66, "flag": "-x" }, { "name": "-a", "lines": 4, "flag": "-a" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-w", "lines": 7, "flag": "-w" }, { "name": "-b", "lines": 5, "flag": "-b" }, { "name": "-D", "lines": 5, "flag": "-D" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-n", "lines": 5, "flag": "-n" }, { "name": "-p", "lines": 5, "flag": "-p" }, { "name": "-r", "lines": 5, "flag": "-r" }, { "name": "-t", "lines": 5, "flag": "-t" }, { "name": "-u", "lines": 4, "flag": "-u" }, { "name": "-z", "lines": 3, "flag": "-z" }, { "name": "import, log, history, CVS commands", "lines": 45 }, { "name": "import options", "lines": 5 }, { "name": "-m", "lines": 6, "flag": "-m" }, { "name": "-b", "lines": 4, "flag": "-b" }, { "name": "-k", "lines": 6, "flag": "-k" }, { "name": "-I", "lines": 8, "flag": "-I" }, { "name": "-W", "lines": 8, "flag": "-W" }, { "name": "-X", "lines": 13, "flag": "-X" }, { "name": "import output", "lines": 39 }, { "name": "import examples", "lines": 3 }, { "name": "log, ls & rls, import, CVS commands", "lines": 24 }, { "name": "log options", "lines": 8 }, { "name": "-b", "lines": 5, "flag": "-b" }, { "name": "-d", "lines": 44, "flag": "-d" }, { "name": "-h", "lines": 5, "flag": "-h" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-N", "lines": 6, "flag": "-N" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 56, "flag": "-r" }, { "name": "-S", "lines": 4, "flag": "-S" }, { "name": "-s", "lines": 7, "flag": "-s" }, { "name": "-t", "lines": 4, "flag": "-t" }, { "name": "-w", "lines": 8, "flag": "-w" }, { "name": "log examples", "lines": 15 }, { "name": "ls & rls", "lines": 1 }, { "name": "List files in the repository", "lines": 23 }, { "name": "ls & rls options", "lines": 4 }, { "name": "-d", "lines": 4, "flag": "-d" }, { "name": "-e", "lines": 5, "flag": "-e" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-P", "lines": 4, "flag": "-P" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 5, "flag": "-r" }, { "name": "-D", "lines": 3, "flag": "-D" }, { "name": "rls examples", "lines": 27 }, { "name": "rdiff, release, ls & rls, CVS commands", "lines": 23 }, { "name": "rdiff options", "lines": 5 }, { "name": "-D", "lines": 4, "flag": "-D" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-k", "lines": 4, "flag": "-k" }, { "name": "-l", "lines": 4, "flag": "-l" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 8, "flag": "-r" }, { "name": "-c", "lines": 4, "flag": "-c" }, { "name": "-p", "lines": 4, "flag": "-p" }, { "name": "-s", "lines": 7, "flag": "-s" }, { "name": "-t", "lines": 5, "flag": "-t" }, { "name": "-u", "lines": 6, "flag": "-u" }, { "name": "-V", "lines": 5, "flag": "-V" }, { "name": "rdiff examples", "lines": 26 }, { "name": "release, server & pserver, rdiff, CVS commands", "lines": 22 }, { "name": "release options", "lines": 4 }, { "name": "-d", "lines": 9, "flag": "-d" }, { "name": "release output", "lines": 47 }, { "name": "release examples", "lines": 15 }, { "name": "server & pserver", "lines": 1 }, { "name": "Act as a server for a client on stdin/stdout", "lines": 19 }, { "name": "-c path", "lines": 5, "flag": "-c" }, { "name": "suck, update, server & pserver, CVS commands", "lines": 12 }, { "name": "update, , suck, CVS commands", "lines": 17 }, { "name": "update options", "lines": 5 }, { "name": "-D date", "lines": 5, "flag": "-D" }, { "name": "-f", "lines": 5, "flag": "-f" }, { "name": "-k", "lines": 7, "flag": "-k" }, { "name": "-l", "lines": 5, "flag": "-l" }, { "name": "-P", "lines": 4, "flag": "-P" }, { "name": "-p", "lines": 4, "flag": "-p" }, { "name": "-R", "lines": 4, "flag": "-R" }, { "name": "-r", "lines": 9, "flag": "-r" }, { "name": "-A", "lines": 5, "flag": "-A" }, { "name": "-C", "lines": 5, "flag": "-C" }, { "name": "-d", "lines": 13, "flag": "-d" }, { "name": "-I", "lines": 7, "flag": "-I" }, { "name": "-W", "lines": 8, "flag": "-W" }, { "name": "-j", "lines": 20, "flag": "-j" }, { "name": "update output", "lines": 71 } ] }, { "name": "AUTHORS", "lines": 18, "subsections": [] }, { "name": "SEE ALSO", "lines": 14, "subsections": [] } ], "sections": { "NAME": { "content": "cvs - Concurrent Versions System\n", "subsections": [] }, "SYNOPSIS": { "content": "cvs [ cvsoptions ]\ncvscommand [ commandoptions ] [ commandargs ]\n", "subsections": [] }, "NOTE": { "content": "This manual page is a summary of parts of the cvs documentation and automatically generated\nfrom an appendix of the CVS manual (the Cederqvist), which is also the target of all cross-\nreferences found in this manual page; please refer to the full CVS manual for more in-depth\ndocumentation of the Concurrent Versions System.\n\nIf you're reading this manual page as part of the MirBSD online (HTML) manual pages archive,\nfollow the cvs(GNU) link to the Cederqvist (and the cvsclient(GNU) link to the client/server\nprotocol description, if necessary).\n\nIf you installed cvs via the Debian or MirPorts Framework package management systems,\n/usr/mpkg/share/doc/cvs/cvs.pdf (MirPorts Framework) or\n/usr/share/doc/cvs/cvs.pdf (Debian), respectively,\nare versions of the Cederqvist rendered as books, for printing and reading on screen.\n\nIf you have a Texinfo reader such as info installed (part of the base system on MirBSD; part\nof the info package on Debian), you can read the Cederqvist by entering:\ninfo cvs\n\nQuick introduction to info so you aren't immediately lost:\n\narrow keys\nto move on the page\n\nTab\nto move to the next hyperlink\n\nReturn\nto activate the hyperlink under the cursor\n\nl (lowercase ell)\nto go to the previously visited page\n\nPage Up/b, Page Down/Space\nto move by screen pages, including advancing to the previous (or next, respectively)\nsection at the first (last) screen page\n\np, n\nto go to the previous (next) page on the current navigation hierarchy level\n\nt to go to the \"Top\" page, i.e. the start of the document\n\n/Return\nto start a search from the current cursor position and jump to the first result\n\n/Return\nto jump to the next result in an ongoing search\n\nq to exit the info viewer\n\nOther ways to read further documentation are described in the SEE ALSO section of this manual\npage.\n", "subsections": [ { "name": "CVS commands", "content": "" }, { "name": "Guide to CVS commands", "content": "This appendix describes the overall structure of cvs commands, and describes some commands in\ndetail (others are described elsewhere; for a quick reference to cvs commands, see node 'In‐\nvoking CVS' in the CVS manual, and for an alphabetical list of all cvs commands, see node\n'CVS command list' in the CVS manual).\n\n" } ] }, "Structure": { "content": "", "subsections": [ { "name": "Overall structure of CVS commands", "content": "The overall format of all cvs commands is:\n\n\ncvs [ cvsoptions ] cvscommand [ commandoptions ] [ commandargs ]\n\n\n\n\n\n" }, { "name": "cvs", "content": "The name of the cvs program.\n\n\n\ncvsoptions\n\nSome options that affect all sub-commands of cvs. These are described below.\n\n\n\ncvscommand\n\nOne of several different sub-commands. Some of the commands have aliases that can be used\ninstead; those aliases are noted in the reference manual for that command. There are only\ntwo situations where you may omit cvscommand: cvs -H elicits a list of available commands,\nand cvs -v displays version information on cvs itself.\n\n\n\ncommandoptions\n\nOptions that are specific for the command.\n\n\n\ncommandargs\n\nArguments to the commands.\n\nThere is unfortunately some confusion between cvsoptions and commandoptions. When given\nas a cvsoption, some options only affect some of the commands. When given as a com‐‐\nmandoption it may have a different meaning, and be accepted by more commands. In other\nwords, do not take the above categorization too seriously. Look at the documentation in‐\nstead.\n\n" }, { "name": "Exit status", "content": "" }, { "name": "CVS's exit status", "content": "cvs can indicate to the calling environment whether it succeeded or failed by setting its\nexit status. The exact way of testing the exit status will vary from one operating system to\nanother. For example in a unix shell script the $? variable will be 0 if the last command\nreturned a successful exit status, or greater than 0 if the exit status indicated failure.\n\nIf cvs is successful, it returns a successful status; if there is an error, it prints an er‐\nror message and returns a failure status. The one exception to this is the cvs diff command.\nIt will return a successful status if it found no differences, or a failure status if there\nwere differences or if there was an error. Because this behavior provides no good way to de‐\ntect errors, in the future it is possible that cvs diff will be changed to behave like the\nother cvs commands.\n\n\n~/.cvsrc" }, { "name": "Default options and the ~/.cvsrc file", "content": "There are some commandoptions that are used so often that you might have set up an alias or\nsome other means to make sure you always specify that option. One example (the one that\ndrove the implementation of the .cvsrc support, actually) is that many people find the de‐\nfault output of the diff command to be very hard to read, and that either context diffs or\nunidiffs are much easier to understand.\n\nThe ~/.cvsrc file is a way that you can add default options to cvscommands within cvs, in‐\nstead of relying on aliases or other shell scripts.\n\nThe format of the ~/.cvsrc file is simple. The file is searched for a line that begins with\nthe same name as the cvscommand being executed. If a match is found, then the remainder of\nthe line is split up (at whitespace characters) into separate options and added to the com‐\nmand arguments before any options from the command line.\n\nIf a command has two names (e.g., checkout and co), the official name, not necessarily the\none used on the command line, will be used to match against the file. So if this is the con‐\ntents of the user's ~/.cvsrc file:\n\n\nlog -N\ndiff -uN\nrdiff -u\nupdate -Pd\ncheckout -P\nrelease -d\n\n\n\n\nthe command cvs checkout foo would have the -P option added to the arguments, as well as cvs\nco foo.\n\nWith the example file above, the output from cvs diff foobar will be in unidiff format. cvs\ndiff -c foobar will provide context diffs, as usual. Getting \"old\" format diffs would be\nslightly more complicated, because diff doesn't have an option to specify use of the \"old\"\nformat, so you would need cvs -f diff foobar.\n\nIn place of the command name you can use cvs to specify global options (see node 'Global op‐\ntions' in the CVS manual). For example the following line in .cvsrc\n\n\ncvs -z6\n\n\n\n\ncauses cvs to use compression level 6.\n\n" }, { "name": "Global options", "content": "The available cvsoptions (that are given to the left of cvscommand) are:\n\n\n\n--allow-root=rootdir\n\nMay be invoked multiple times to specify one legal cvsroot directory with each invocation.\nAlso causes CVS to preparse the configuration file for each specified root, which can be\nuseful when configuring write proxies, See node 'Password authentication server' in the\nCVS manual & node 'Write proxies' in the CVS manual.\n\n\n" }, { "name": "-a", "content": "Authenticate all communication between the client and the server. Only has an effect on\nthe cvs client. As of this writing, this is only implemented when using a GSSAPI connec‐\ntion (see node 'GSSAPI authenticated' in the CVS manual). Authentication prevents certain\nsorts of attacks involving hijacking the active tcp connection. Enabling authentication\ndoes not enable encryption.\n\n\n", "flag": "-a" }, { "name": "-b", "content": "In cvs 1.9.18 and older, this specified that rcs programs are in the bindir directory.\nCurrent versions of cvs do not run rcs programs; for compatibility this option is accepted,\nbut it does nothing.\n\n\n", "flag": "-b" }, { "name": "-T", "content": "Use tempdir as the directory where temporary files are located.\n\nThe cvs client and server store temporary files in a temporary directory. The path to this\ntemporary directory is set via, in order of precedence:\n\n\n• The argument to the global -T option.\n\n\n• The value set for TmpDir in the config file (server only - see node 'config' in the CVS\nmanual).\n\n\n• The contents of the $TMPDIR environment variable (%TMPDIR% on Windows - see node 'Envi‐\nronment variables' in the CVS manual).\n\n\n• /tmp\n\n\nTemporary directories should always be specified as an absolute pathname. When running a\nCVS client, -T affects only the local process; specifying -T for the client has no effect\non the server and vice versa.\n\n\n", "flag": "-T" }, { "name": "-d", "content": "Use cvsrootdirectory as the root directory pathname of the repository. Overrides the\nsetting of the $CVSROOT environment variable. See node 'Repository' in the CVS manual.\n\n\n", "flag": "-d" }, { "name": "-e", "content": "Use editor to enter revision log information. Overrides the setting of the $CVSEDITOR and\n$EDITOR environment variables. For more information, see node 'Committing your changes' in\nthe CVS manual.\n\n\n", "flag": "-e" }, { "name": "-f", "content": "Do not read the ~/.cvsrc file. This option is most often used because of the non-orthogo‐\nnality of the cvs option set. For example, the cvs log option -N (turn off display of tag\nnames) does not have a corresponding option to turn the display on. So if you have -N in\nthe ~/.cvsrc entry for log, you may need to use -f to show the tag names.\n\n\n", "flag": "-f" }, { "name": "-g", "content": "Forges group-writable permissions on files in the working copy. This option is typically\nused when you have multiple users sharing a single checked out source tree, allowing them\nto operate their shells with a less dangerous umask at the expense of cvs security. To use\nthis feature, create a directory to hold the checked-out source tree, set it to a private\ngroup, and set up the directory such that files created under it inherit the gid of the di‐\nrectory. On BSD systems, this occurs automatically. On SYSV systems and GNU/Linux, the\nsgid bit must be set on the directory for this. The users who are to share the checked out\ntree must be placed in that group which owns the directory.\n\nNote that the sharing of a single checked-out source tree is very different from giving\nseveral users access to a common cvs repository. Access to a common cvs repository already\nmaintains shared group-write permissions and does not require this option.\n\nDue to the security implications, setting this option globally in your .cvsrc file is\nstrongly discouraged; if you must, ensure all source checkouts are \"firewalled\" within a\nprivate group or a private mode 0700 directory.\n\nThis option is a MidnightBSD extension merged into Debian and MirBSD cvs.\n\n\n", "flag": "-g" }, { "name": "-H", "content": "", "flag": "-H" }, { "name": "--help", "content": "Display usage information about the specified cvscommand (but do not actually execute the\ncommand). If you don't specify a command name, cvs -H displays overall help for cvs, in‐\ncluding a list of other help options.\n\n\n", "long": "--help" }, { "name": "-R", "content": "Turns on read-only repository mode. This allows one to check out from a read-only reposi‐\ntory, such as within an anoncvs server, or from a cd-rom repository.\n\nSame effect as if the CVSREADONLYFS environment variable is set. Using -R can also consid‐\nerably speed up checkouts over NFS.\n\n\n", "flag": "-R" }, { "name": "-n", "content": "Do not change any files. Attempt to execute the cvscommand, but only to issue reports; do\nnot remove, update, or merge any existing files, or create any new files.\n\nNote that cvs will not necessarily produce exactly the same output as without -n. In some\ncases the output will be the same, but in other cases cvs will skip some of the processing\nthat would have been required to produce the exact same output.\n\n\n", "flag": "-n" }, { "name": "-Q", "content": "Cause the command to be really quiet; the command will only generate output for serious\nproblems.\n\n\n", "flag": "-Q" }, { "name": "-q", "content": "Cause the command to be somewhat quiet; informational messages, such as reports of recur‐\nsion through subdirectories, are suppressed.\n\n\n", "flag": "-q" }, { "name": "-r", "content": "Make new working files read-only. Same effect as if the $CVSREAD environment variable is\nset (see node 'Environment variables' in the CVS manual). The default is to make working\nfiles writable, unless watches are on (see node 'Watches' in the CVS manual).\n\n\n", "flag": "-r" }, { "name": "-s", "content": "Set a user variable (see node 'Variables' in the CVS manual).\n\n\n", "flag": "-s" }, { "name": "-t", "content": "Trace program execution; display messages showing the steps of cvs activity. Particularly\nuseful with -n to explore the potential impact of an unfamiliar command.\n\n\n", "flag": "-t" }, { "name": "-v", "content": "", "flag": "-v" }, { "name": "--version", "content": "Display version and copyright information for cvs.\n\n\n", "long": "--version" }, { "name": "-w", "content": "Make new working files read-write. Overrides the setting of the $CVSREAD environment vari‐\nable. Files are created read-write by default, unless $CVSREAD is set or -r is given.\n\n\n", "flag": "-w" }, { "name": "-x", "content": "Encrypt all communication between the client and the server. Only has an effect on the cvs\nclient. As of this writing, this is only implemented when using a GSSAPI connection (see\nnode 'GSSAPI authenticated' in the CVS manual) or a Kerberos connection (see node 'Kerberos\nauthenticated' in the CVS manual). Enabling encryption implies that message traffic is\nalso authenticated. Encryption support is not available by default; it must be enabled us‐\ning a special configure option, --enable-encryption, when you build cvs.\n\n\n", "flag": "-x" }, { "name": "-z", "content": "Request compression level for network traffic. cvs interprets level identically to the\ngzip program. Valid levels are 1 (high speed, low compression) to 9 (low speed, high com‐\npression), or 0 to disable compression (the default). Data sent to the server will be com‐\npressed at the requested level and the client will request the server use the same compres‐\nsion level for data returned. The server will use the closest level allowed by the server\nadministrator to compress returned data. This option only has an effect when passed to the\ncvs client.\n\n", "flag": "-z" }, { "name": "Common options", "content": "" }, { "name": "Common command options", "content": "This section describes the commandoptions that are available across several cvs commands.\nThese options are always given to the right of cvscommand. Not all commands support all of\nthese options; each option is only supported for commands where it makes sense. However,\nwhen a command has one of these options you can almost always count on the same behavior of\nthe option as in other commands. (Other command options, which are listed with the individ‐\nual commands, may have different behavior from one cvs command to the other).\n\nNote: the history command is an exception; it supports many options that conflict even with\nthese standard options.\n\n\n" }, { "name": "-D", "content": "Use the most recent revision no later than datespec. datespec is a single argument, a\ndate description specifying a date in the past.\n\nThe specification is sticky when you use it to make a private copy of a source file; that\nis, when you get a working file using -D, cvs records the date you specified, so that fur‐\nther updates in the same directory will use the same date (for more information on sticky\ntags/dates, see node 'Sticky tags' in the CVS manual).\n\n-D is available with the annotate, checkout, diff, export, history, ls, rdiff, rls, rtag,\ntag, and update commands. (The history command uses this option in a slightly different\nway; see node 'history options' in the CVS manual).\n\nFor a complete description of the date formats accepted by cvs, see node 'Date input for‐\nmats' in the CVS manual.\n\nRemember to quote the argument to the -D flag so that your shell doesn't interpret spaces\nas argument separators. A command using the -D flag can look like this:\n\n\n$ cvs diff -D \"1 hour ago\" cvs.texinfo\n\n\n\n\n\n", "flag": "-D" }, { "name": "-f", "content": "When you specify a particular date or tag to cvs commands, they normally ignore files that\ndo not contain the tag (or did not exist prior to the date) that you specified. Use the -f\noption if you want files retrieved even when there is no match for the tag or date. (The\nmost recent revision of the file will be used).\n\nNote that even with -f, a tag that you specify must exist (that is, in some file, not nec‐\nessary in every file). This is so that cvs will continue to give an error if you mistype a\ntag name.\n\n-f is available with these commands: annotate, checkout, export, rdiff, rtag, and update.\n\nWARNING: The commit and remove commands also have a -f option, but it has a different be‐\nhavior for those commands. See node 'commit options' in the CVS manual, and node 'Removing\nfiles' in the CVS manual.\n\n\n", "flag": "-f" }, { "name": "-k", "content": "Override the default processing of RCS keywords other than -kb. See node 'Keyword substi‐\ntution' in the CVS manual, for the meaning of kflag. Used with the checkout and update\ncommands, your kflag specification is sticky; that is, when you use this option with a\ncheckout or update command, cvs associates your selected kflag with any files it operates\non, and continues to use that kflag with future commands on the same files until you spec‐\nify otherwise.\n\nThe -k option is available with the add, checkout, diff, export, import, rdiff, and update\ncommands.\n\nWARNING: Prior to CVS version 1.12.2, the -k flag overrode the -kb indication for a binary\nfile. This could sometimes corrupt binary files. See node 'Merging and keywords' in the\nCVS manual, for more.\n\n\n", "flag": "-k" }, { "name": "-l", "content": "Local; run only in current working directory, rather than recursing through subdirectories.\n\nAvailable with the following commands: annotate, checkout, commit, diff, edit, editors, ex‐‐\nport, log, rdiff, remove, rtag, status, tag, unedit, update, watch, and watchers.\n\n\n", "flag": "-l" }, { "name": "-m", "content": "Use message as log information, instead of invoking an editor.\n\nAvailable with the following commands: add, commit and import.\n\n\n", "flag": "-m" }, { "name": "-n", "content": "Do not run any tag program. (A program can be specified to run in the modules database\n(see node 'modules' in the CVS manual); this option bypasses it).\n\nNote: this is not the same as the cvs -n program option, which you can specify to the left\nof a cvs command!\n\nAvailable with the checkout, commit, export, and rtag commands.\n\n\n", "flag": "-n" }, { "name": "-P", "content": "Prune empty directories. See node 'Removing directories' in the CVS manual.\n\n\n", "flag": "-P" }, { "name": "-p", "content": "Pipe the files retrieved from the repository to standard output, rather than writing them\nin the current directory. Available with the checkout and update commands.\n\n\n", "flag": "-p" }, { "name": "-R", "content": "Process directories recursively. This is the default for all cvs commands, with the excep‐\ntion of ls & rls.\n\nAvailable with the following commands: annotate, checkout, commit, diff, edit, editors, ex‐‐\nport, ls, rdiff, remove, rls, rtag, status, tag, unedit, update, watch, and watchers.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "", "flag": "-r" }, { "name": "-r", "content": "Use the revision specified by the tag argument (and the date argument for the commands\nwhich accept it) instead of the default head revision. As well as arbitrary tags defined\nwith the tag or rtag command, two special tags are always available: HEAD refers to the\nmost recent version available in the repository (also known as the tip of the MAIN branch,\nalso known as trunk; the name of a branch refers to its tip; this version of cvs introduces\n.bhead, but only for the diff command, for the same), and BASE refers to the revision you\nlast checked out into the current working directory.\n\nThe tag specification is sticky when you use this with checkout or update to make your own\ncopy of a file: cvs remembers the tag and continues to use it on future update commands,\nuntil you specify otherwise (for more information on sticky tags/dates, see node 'Sticky\ntags' in the CVS manual).\n\nThe tag can be either a symbolic or numeric tag, as described in node 'Tags' in the CVS\nmanual, or the name of a branch, as described in node 'Branching and merging' in the CVS\nmanual. When tag is the name of a branch, some commands accept the optional date argument\nto specify the revision as of the given date on the branch. When a command expects a spe‐\ncific revision, the name of a branch is interpreted as the most recent revision on that\nbranch.\n\nAs a Debian and MirBSD cvs extension, specifying BASE as the date portion of the argument\nyields the base revision of the branch specified by the tag portion of the argument, i.e.\nthe revision on the parent branch the tag branch split off, or, where both branches were\nthe same. This option has not received very much testing, beware!\n\nSpecifying the -q global option along with the -r command option is often useful, to sup‐\npress the warning messages when the rcs file does not contain the specified tag.\n\nNote: this is not the same as the overall cvs -r option, which you can specify to the left\nof a cvs command!\n\n-r tag is available with the commit and history commands.\n\n-r tag[:date] is available with the annotate, checkout, diff, export, rdiff, rtag, and up‐‐\ndate commands.\n\n\n", "flag": "-r" }, { "name": "-W", "content": "Specify file names that should be filtered. You can use this option repeatedly. The spec\ncan be a file name pattern of the same type that you can specify in the .cvswrappers file.\nAvailable with the following commands: import, and update.\n\n\n", "flag": "-W" }, { "name": "admin, annotate, Date input formats, CVS commands", "content": "admin——Administration front-end for RCS\n• Requires: repository, working directory.\n\n• Changes: repository.\n\n• Synonym: rcs\n\nThis is the cvs interface to assorted administrative facilities. Some of them have ques‐\ntionable usefulness for cvs but exist for historical purposes. Some of the questionable\noptions are likely to disappear in the future. This command does work recursively, so ex‐\ntreme care should be used.\n\nOn unix, if there is a group named cvsadmin, only members of that group can run cvs admin\ncommands, except for those specified using the UserAdminOptions configuration option in the\nCVSROOT/config file. Options specified using UserAdminOptions can be run by any user. See\nnode 'config' in the CVS manual for more on UserAdminOptions.\n\nThe cvsadmin group should exist on the server, or any system running the non-client/server\ncvs. To disallow cvs admin for all users, create a group with no users in it. On NT, the\ncvsadmin feature does not exist and all users can run cvs admin.\n\n" }, { "name": "admin options", "content": "Some of these options have questionable usefulness for cvs but exist for historical purposes.\nSome even make it impossible to use cvs until you undo the effect!\n\n\n" }, { "name": "-A", "content": "Might not work together with cvs. Append the access list of oldfile to the access list of\nthe rcs file.\n\n\n", "flag": "-A" }, { "name": "-a", "content": "Might not work together with cvs. Append the login names appearing in the comma-separated\nlist logins to the access list of the rcs file.\n\n\n", "flag": "-a" }, { "name": "-b[", "content": "Set the default branch to rev. In cvs, you normally do not manipulate default branches;\nsticky tags (see node 'Sticky tags' in the CVS manual) are a better way to decide which\nbranch you want to work on. There is one reason to run cvs admin -b: to revert to the ven‐\ndor's version when using vendor branches (see node 'Reverting local changes' in the CVS\nmanual). There can be no space between -b and its argument.\n\n\n" }, { "name": "-c", "content": "Sets the comment leader to string. The comment leader is not used by current versions of\ncvs or rcs 5.7. Therefore, you can almost surely not worry about it. See node 'Keyword\nsubstitution' in the CVS manual.\n\n\n", "flag": "-c" }, { "name": "-e[", "content": "Might not work together with cvs. Erase the login names appearing in the comma-separated\nlist logins from the access list of the RCS file. If logins is omitted, erase the entire\naccess list. There can be no space between -e and its argument.\n\n\n" }, { "name": "-I", "content": "Run interactively, even if the standard input is not a terminal. This option does not work\nwith the client/server cvs and is likely to disappear in a future release of cvs.\n\n\n", "flag": "-I" }, { "name": "-i", "content": "Useless with cvs. This creates and initialises a new rcs file, without depositing a revi‐\nsion. With cvs, add files with the cvs add command (see node 'Adding files' in the CVS\nmanual).\n\n\n", "flag": "-i" }, { "name": "-k", "content": "Set the default keyword substitution to subst. See node 'Keyword substitution' in the CVS\nmanual. Giving an explicit -k option to cvs update, cvs export, or cvs checkout overrides\nthis default.\n\n\n", "flag": "-k" }, { "name": "-l[", "content": "Lock the revision with number rev. If a branch is given, lock the latest revision on that\nbranch. If rev is omitted, lock the latest revision on the default branch. There can be\nno space between -l and its argument.\n\nThis can be used in conjunction with the rcslock.pl script in the contrib directory of the\ncvs source distribution to provide reserved checkouts (where only one user can be editing a\ngiven file at a time). See the comments in that file for details (and see the README file\nin that directory for disclaimers about the unsupported nature of contrib). According to\ncomments in that file, locking must set to strict (which is the default).\n\n\n" }, { "name": "-L", "content": "Set locking to strict. Strict locking means that the owner of an RCS file is not exempt\nfrom locking for checkin. For use with cvs, strict locking must be set; see the discussion\nunder the -l option above.\n\n\n", "flag": "-L" }, { "name": "-m", "content": "Replace the log message of revision rev with msg.\n\n\n", "flag": "-m" }, { "name": "-N", "content": "Act like -n, except override any previous assignment of name. For use with magic branches,\nsee node 'Magic branch numbers' in the CVS manual.\n\n\n", "flag": "-N" }, { "name": "-n", "content": "Associate the symbolic name name with the branch or revision rev. It is normally better to\nuse cvs tag or cvs rtag instead. Delete the symbolic name if both : and rev are omitted;\notherwise, print an error message if name is already associated with another number. If\nrev is symbolic, it is expanded before association. A rev consisting of a branch number\nfollowed by a . stands for the current latest revision in the branch. A : with an empty\nrev stands for the current latest revision on the default branch, normally the trunk. For\nexample, cvs admin -nname: associates name with the current latest revision of all the RCS\nfiles; this contrasts with cvs admin -nname:$ which associates name with the revision num‐\nbers extracted from keyword strings in the corresponding working files.\n\n\n", "flag": "-n" }, { "name": "-o", "content": "Deletes (outdates) the revisions given by range.\n\nNote that this command can be quite dangerous unless you know exactly what you are doing\n(for example see the warnings below about how the rev1:rev2 syntax is confusing).\n\nIf you are short on disc this option might help you. But think twice before using it—there\nis no way short of restoring the latest backup to undo this command! If you delete differ‐\nent revisions than you planned, either due to carelessness or (heaven forbid) a cvs bug,\nthere is no opportunity to correct the error before the revisions are deleted. It probably\nwould be a good idea to experiment on a copy of the repository first.\n\nSpecify range in one of the following ways:\n\n\nrev1::rev2\n\nCollapse all revisions between rev1 and rev2, so that cvs only stores the differences as‐\nsociated with going from rev1 to rev2, not intermediate steps. For example, after -o\n1.3::1.5 one can retrieve revision 1.3, revision 1.5, or the differences to get from 1.3\nto 1.5, but not the revision 1.4, or the differences between 1.3 and 1.4. Other exam‐\nples: -o 1.3::1.4 and -o 1.3::1.3 have no effect, because there are no intermediate revi‐\nsions to remove.\n\n\n::rev\n\nCollapse revisions between the beginning of the branch containing rev and rev itself.\nThe branchpoint and rev are left intact. For example, -o ::1.3.2.6 deletes revision\n1.3.2.1, revision 1.3.2.5, and everything in between, but leaves 1.3 and 1.3.2.6 intact.\n\n\nrev::\n\nCollapse revisions between rev and the end of the branch containing rev. Revision rev is\nleft intact but the head revision is deleted.\n\n\nrev\n\nDelete the revision rev. For example, -o 1.3 is equivalent to -o 1.2::1.4.\n\n\nrev1:rev2\n\nDelete the revisions from rev1 to rev2, inclusive, on the same branch. One will not be\nable to retrieve rev1 or rev2 or any of the revisions in between. For example, the com‐\nmand cvs admin -oR101:R102 . is rarely useful. It means to delete revisions up to,\nand including, the tag R102. But beware! If there are files that have not changed be‐\ntween R102 and R103 the file will have the same numerical revision number assigned to\nthe tags R102 and R103. So not only will it be impossible to retrieve R102; R103\nwill also have to be restored from the tapes! In most cases you want to specify\nrev1::rev2 instead.\n\n\n:rev\n\nDelete revisions from the beginning of the branch containing rev up to and including rev.\n\n\nrev:\n\nDelete revisions from revision rev, including rev itself, to the end of the branch con‐\ntaining rev.\n\nNone of the revisions to be deleted may have branches or locks.\n\nIf any of the revisions to be deleted have symbolic names, and one specifies one of the\n:: syntaxes, then cvs will give an error and not delete any revisions. If you really\nwant to delete both the symbolic names and the revisions, first delete the symbolic names\nwith cvs tag -d, then run cvs admin -o. If one specifies the non-:: syntaxes, then cvs\nwill delete the revisions but leave the symbolic names pointing to nonexistent revisions.\nThis behavior is preserved for compatibility with previous versions of cvs, but because\nit isn't very useful, in the future it may change to be like the :: case.\n\nDue to the way cvs handles branches rev cannot be specified symbolically if it is a\nbranch. See node 'Magic branch numbers' in the CVS manual, for an explanation.\n\nMake sure that no-one has checked out a copy of the revision you outdate. Strange things\nwill happen if he starts to edit it and tries to check it back in. For this reason, this\noption is not a good way to take back a bogus commit; commit a new revision undoing the\nbogus change instead (see node 'Merging two revisions' in the CVS manual).\n\n\n", "flag": "-o" }, { "name": "-q", "content": "Run quietly; do not print diagnostics.\n\n\n", "flag": "-q" }, { "name": "-s", "content": "Useful with cvs. Set the state attribute of the revision rev to state. If rev is a branch\nnumber, assume the latest revision on that branch. If rev is omitted, assume the latest\nrevision on the default branch. Any identifier is acceptable for state. A useful set of\nstates is Exp (for experimental), Stab (for stable), and Rel (for released). By default,\nthe state of a new revision is set to Exp when it is created. The state is visible in the\noutput from cvs log (see node 'log' in the CVS manual), and in the $Log$ and $State$ key‐\nwords (see node 'Keyword substitution' in the CVS manual). Note that cvs uses the dead\nstate for its own purposes (see node 'Attic' in the CVS manual); to take a file to or from\nthe dead state use commands like cvs remove and cvs add (see node 'Adding and removing' in\nthe CVS manual), not cvs admin -s.\n\n\n", "flag": "-s" }, { "name": "-t[", "content": "Useful with cvs. Write descriptive text from the contents of the named file into the RCS\nfile, deleting the existing text. The file pathname may not begin with -. The descriptive\ntext can be seen in the output from cvs log (see node 'log' in the CVS manual). There can\nbe no space between -t and its argument.\n\nIf file is omitted, obtain the text from standard input, terminated by end-of-file or by a\nline containing . by itself. Prompt for the text if interaction is possible; see -I.\n\n\n" }, { "name": "-t-", "content": "Similar to -tfile. Write descriptive text from the string into the rcs file, deleting the\nexisting text. There can be no space between -t and its argument.\n\n\n" }, { "name": "-U", "content": "Set locking to non-strict. Non-strict locking means that the owner of a file need not lock\na revision for checkin. For use with cvs, strict locking must be set; see the discussion\nunder the -l option above.\n\n\n", "flag": "-U" }, { "name": "-u[", "content": "See the option -l above, for a discussion of using this option with cvs. Unlock the revi‐\nsion with number rev. If a branch is given, unlock the latest revision on that branch. If\nrev is omitted, remove the latest lock held by the caller. Normally, only the locker of a\nrevision may unlock it; somebody else unlocking a revision breaks the lock. This causes\nthe original locker to be sent a commit notification (see node 'Getting Notified' in the\nCVS manual). There can be no space between -u and its argument.\n\n\n" }, { "name": "-V", "content": "In previous versions of cvs, this option meant to write an rcs file which would be accept‐\nable to rcs version n, but it is now obsolete and specifying it will produce an error.\n\n\n", "flag": "-V" }, { "name": "-x", "content": "In previous versions of cvs, this was documented as a way of specifying the names of the\nrcs files. However, cvs has always required that the rcs files used by cvs end in ,v, so\nthis option has never done anything useful.\n\n\n", "flag": "-x" }, { "name": "annotate, checkout, admin, CVS commands", "content": "annotate——What revision modified each line of a file?\n• Synopsis: annotate [options] files...\n\nrannotate [options] files...\n\n• Requires: repository.\n\n• Changes: nothing.\n\nFor each file in files, print the head revision of the trunk, together with information on\nthe last modification for each line. If backwards annotation is requested, show the first\nmodification after the specified revision. (Backwards annotation currently appears to be\nbroken.)\n\n" }, { "name": "annotate options", "content": "These standard options are supported by annotate (see node 'Common options' in the CVS man‐\nual, for a complete description of them):\n\n\n" }, { "name": "-b", "content": "Backwards, show when a line was removed. Currently appears to be broken.\n\n\n", "flag": "-b" }, { "name": "-l", "content": "Local directory only, no recursion.\n\n\n", "flag": "-l" }, { "name": "-R", "content": "Process directories recursively.\n\n\n", "flag": "-R" }, { "name": "-f", "content": "Use head revision if tag/date not found.\n\n\n", "flag": "-f" }, { "name": "-F", "content": "Annotate binary files.\n\n\n", "flag": "-F" }, { "name": "-r", "content": "Annotate file as of specified revision/tag or, when date is specified and tag is a branch\ntag, the version from the branch tag as it existed on date. See node 'Common options' in\nthe CVS manual.\n\n\n", "flag": "-r" }, { "name": "-D", "content": "Annotate file as of specified date.\n\n", "flag": "-D" }, { "name": "annotate example", "content": "For example:\n\n\n$ cvs annotate ssfile\nAnnotations for ssfile\n*\n1.1 (mary 27-Mar-96): ssfile line 1\n1.2 (joe 28-Mar-96): ssfile line 2\n\n\n\n\nThe file ssfile currently contains two lines. The ssfile line 1 line was checked in by mary\non March 27. Then, on March 28, joe added a line ssfile line 2, without modifying the ssfile\nline 1 line. This report doesn't tell you anything about lines which have been deleted or\nreplaced; you need to use cvs diff for that (see node 'diff' in the CVS manual).\n\nThe options to cvs annotate are listed in node 'Invoking CVS' in the CVS manual, and can be\nused to select the files and revisions to annotate. The options are described in more detail\nthere and in node 'Common options' in the CVS manual.\n\n" }, { "name": "checkout, commit, annotate, CVS commands", "content": "checkout——Check out sources for editing\n• Synopsis: checkout [options] modules...\n\n• Requires: repository.\n\n• Changes: working directory.\n\n• Synonyms: co, get\n\nCreate or update a working directory containing copies of the source files specified by\nmodules. You must execute checkout before using most of the other cvs commands, since most\nof them operate on your working directory.\n\nThe modules are either symbolic names for some collection of source directories and files,\nor paths to directories or files in the repository. The symbolic names are defined in the\nmodules file. See node 'modules' in the CVS manual.\n\nDepending on the modules you specify, checkout may recursively create directories and popu‐\nlate them with the appropriate source files. You can then edit these source files at any\ntime (regardless of whether other software developers are editing their own copies of the\nsources); update them to include new changes applied by others to the source repository; or\ncommit your work as a permanent change to the source repository.\n\nNote that checkout is used to create directories. The top-level directory created is al‐\nways added to the directory where checkout is invoked, and usually has the same name as the\nspecified module. In the case of a module alias, the created sub-directory may have a dif‐\nferent name, but you can be sure that it will be a sub-directory, and that checkout will\nshow the relative path leading to each file as it is extracted into your private work area\n(unless you specify the -Q global option).\n\nThe files created by checkout are created read-write, unless the -r option to cvs (see node\n'Global options' in the CVS manual) is specified, the CVSREAD environment variable is spec‐\nified (see node 'Environment variables' in the CVS manual), or a watch is in effect for\nthat file (see node 'Watches' in the CVS manual).\n\nNote that running checkout on a directory that was already built by a prior checkout is\nalso permitted. This is similar to specifying the -d option to the update command in the\nsense that new directories that have been created in the repository will appear in your\nwork area. However, checkout takes a module name whereas update takes a directory name.\nAlso to use checkout this way it must be run from the top level directory (where you origi‐\nnally ran checkout from), so before you run checkout to update an existing directory, don't\nforget to change your directory to the top level directory.\n\nFor the output produced by the checkout command see node 'update output' in the CVS manual.\n\n" }, { "name": "checkout options", "content": "These standard options are supported by checkout (see node 'Common options' in the CVS man‐\nual, for a complete description of them):\n\n\n" }, { "name": "-D", "content": "Use the most recent revision no later than date. This option is sticky, and implies -P.\nSee node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates.\n\n\n", "flag": "-D" }, { "name": "-f", "content": "Only useful with the -D or -r flags. If no matching revision is found, retrieve the most\nrecent revision (instead of ignoring the file).\n\n\n", "flag": "-f" }, { "name": "-k", "content": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual.\nThis option is sticky; future updates of this file in this working directory will use the\nsame kflag. The status command can be viewed to see the sticky options. See node 'Invok‐\ning CVS' in the CVS manual, for more information on the status command.\n\n\n", "flag": "-k" }, { "name": "-l", "content": "Local; run only in current working directory.\n\n\n", "flag": "-l" }, { "name": "-n", "content": "Do not run any checkout program (as specified with the -o option in the modules file; see\nnode 'modules' in the CVS manual).\n\n\n", "flag": "-n" }, { "name": "-P", "content": "Prune empty directories. See node 'Moving directories' in the CVS manual.\n\n\n", "flag": "-P" }, { "name": "-p", "content": "Pipe files to the standard output.\n\n\n", "flag": "-p" }, { "name": "-R", "content": "Checkout directories recursively. This option is on by default.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Checkout the revision specified by tag or, when date is specified and tag is a branch tag,\nthe version from the branch tag as it existed on date. This option is sticky, and implies\n-P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates.\nAlso, see node 'Common options' in the CVS manual.\n\nIn addition to those, you can use these special command options with checkout:\n\n\n", "flag": "-r" }, { "name": "-A", "content": "Reset any sticky tags, dates, or -k options. See node 'Sticky tags' in the CVS manual, for\nmore information on sticky tags/dates.\n\n\n", "flag": "-A" }, { "name": "-c", "content": "Copy the module file, sorted, to the standard output, instead of creating or modifying any\nfiles or directories in your working directory.\n\n\n", "flag": "-c" }, { "name": "-d", "content": "Create a directory called dir for the working files, instead of using the module name. In\ngeneral, using this flag is equivalent to using mkdir dir; cd dir followed by the checkout\ncommand without the -d flag.\n\nThere is an important exception, however. It is very convenient when checking out a single\nitem to have the output appear in a directory that doesn't contain empty intermediate di‐\nrectories. In this case only, cvs tries to ``shorten'' pathnames to avoid those empty di‐\nrectories.\n\nFor example, given a module foo that contains the file bar.c, the command cvs co -d dir foo\nwill create directory dir and place bar.c inside. Similarly, given a module bar which has\nsubdirectory baz wherein there is a file quux.c, the command cvs co -d dir bar/baz will\ncreate directory dir and place quux.c inside.\n\nUsing the -N flag will defeat this behavior. Given the same module definitions above, cvs\nco -N -d dir foo will create directories dir/foo and place bar.c inside, while cvs co -N -d\ndir bar/baz will create directories dir/bar/baz and place quux.c inside.\n\n\n", "flag": "-d" }, { "name": "-j", "content": "With two -j options, merge changes from the revision specified with the first -j option to\nthe revision specified with the second j option, into the working directory.\n\nWith one -j option, merge changes from the ancestor revision to the revision specified with\nthe -j option, into the working directory. The ancestor revision is the common ancestor of\nthe revision which the working directory is based on, and the revision specified in the -j\noption.\n\nIn addition, each -j option can contain an optional date specification which, when used\nwith branches, can limit the chosen revision to one within a specific date. An optional\ndate is specified by adding a colon (:) to the tag: -jSymbolicTag:DateSpecifier.\n\nSee node 'Branching and merging' in the CVS manual.\n\n\n", "flag": "-j" }, { "name": "-N", "content": "Only useful together with -d dir. With this option, cvs will not ``shorten'' module paths\nin your working directory when you check out a single module. See the -d flag for examples\nand a discussion.\n\n\n", "flag": "-N" }, { "name": "-s", "content": "Like -c, but include the status of all modules, and sort it by the status string. See node\n'modules' in the CVS manual, for info about the -s option that is used inside the modules\nfile to set the module status.\n\n", "flag": "-s" }, { "name": "checkout examples", "content": "Get a copy of the module tc:\n\n\n$ cvs checkout tc\n\n\n\n\nGet a copy of the module tc as it looked one day ago:\n\n\n$ cvs checkout -D yesterday tc\n\n\n\n\n" }, { "name": "commit, diff, checkout, CVS commands", "content": "commit——Check files into the repository\n• Synopsis: commit [-lnRf] [-m 'logmessage' | -F file] [-r revision] [files...]\n\n• Requires: working directory, repository.\n\n• Changes: repository.\n\n• Synonym: ci\n\nUse commit when you want to incorporate changes from your working source files into the\nsource repository.\n\nIf you don't specify particular files to commit, all of the files in your working current\ndirectory are examined. commit is careful to change in the repository only those files\nthat you have really changed. By default (or if you explicitly specify the -R option),\nfiles in subdirectories are also examined and committed if they have changed; you can use\nthe -l option to limit commit to the current directory only.\n\ncommit verifies that the selected files are up to date with the current revisions in the\nsource repository; it will notify you, and exit without committing, if any of the specified\nfiles must be made current first with update (see node 'update' in the CVS manual). commit\ndoes not call the update command for you, but rather leaves that for you to do when the\ntime is right.\n\nWhen all is well, an editor is invoked to allow you to enter a log message that will be\nwritten to one or more logging programs (see node 'modules' in the CVS manual, and see node\n'loginfo' in the CVS manual) and placed in the rcs file inside the repository. This log\nmessage can be retrieved with the log command; see node 'log' in the CVS manual. You can\nspecify the log message on the command line with the -m message option, and thus avoid the\neditor invocation, or use the -F file option to specify that the argument file contains the\nlog message.\n\nAt commit, a unique commitid is placed in the rcs file inside the repository. All files\ncommitted at once get the same commitid, a string consisting only of hexadecimal digits\n(usually 16 in GNU cvs, 19 in Debian and MirBSD cvs). FSF GNU cvs 1.11 and OpenBSD OpenCVS\ndo not support commitids yet. The commitid can be retrieved with the log and status com‐\nmand; see node 'log' in the CVS manual and node 'File status' in the CVS manual.\n\n" }, { "name": "commit options", "content": "These standard options are supported by commit (see node 'Common options' in the CVS manual,\nfor a complete description of them):\n\n\n" }, { "name": "-l", "content": "Local; run only in current working directory.\n\n\n", "flag": "-l" }, { "name": "-R", "content": "Commit directories recursively. This is on by default.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Commit to revision. revision must be either a branch, or a revision on the main trunk that\nis higher than any existing revision number (see node 'Assigning revisions' in the CVS man‐\nual). You cannot commit to a specific revision on a branch.\n\ncommit also supports these options:\n\n\n", "flag": "-r" }, { "name": "-c", "content": "Refuse to commit files unless the user has registered a valid edit on the file via cvs\nedit. This is most useful when commit -c and edit -c have been placed in all .cvsrc files.\nA commit can be forced anyways by either regestering an edit retroactively via cvs edit (no\nchanges to the file will be lost) or using the -f option to commit. Support for commit -c\nrequires both client and a server versions 1.12.10 or greater.\n\n\n", "flag": "-c" }, { "name": "-F", "content": "Read the log message from file, instead of invoking an editor.\n\n\n", "flag": "-F" }, { "name": "-f", "content": "Note that this is not the standard behavior of the -f option as defined in node 'Common op‐\ntions' in the CVS manual.\n\nForce cvs to commit a new revision even if you haven't made any changes to the file. As of\ncvs version 1.12.10, it also causes the -c option to be ignored. If the current revision\nof file is 1.7, then the following two commands are equivalent:\n\n\n$ cvs commit -f file\n$ cvs commit -r 1.8 file\n\n\n\n\nThe -f option disables recursion (i.e., it implies -l). To force cvs to commit a new revi‐\nsion for all files in all subdirectories, you must use -f -R.\n\n\n", "flag": "-f" }, { "name": "-m", "content": "Use message as the log message, instead of invoking an editor.\n\n", "flag": "-m" }, { "name": "commit examples", "content": "" }, { "name": "Committing to a branch", "content": "You can commit to a branch revision (one that has an even number of dots) with the -r option.\nTo create a branch revision, use the -b option of the rtag or tag commands (see node 'Branch‐\ning and merging' in the CVS manual). Then, either checkout or update can be used to base\nyour sources on the newly created branch. From that point on, all commit changes made within\nthese working sources will be automatically added to a branch revision, thereby not disturb‐\ning main-line development in any way. For example, if you had to create a patch to the 1.2\nversion of the product, even though the 2.0 version is already under development, you might\ndo:\n\n\n$ cvs rtag -b -r FCS12 FCS12Patch productmodule\n$ cvs checkout -r FCS12Patch productmodule\n$ cd productmodule\n[[ hack away ]]\n$ cvs commit\n\n\n\n\nThis works automatically since the -r option is sticky.\n\n" }, { "name": "Creating the branch after editing", "content": "Say you have been working on some extremely experimental software, based on whatever revision\nyou happened to checkout last week. If others in your group would like to work on this soft‐\nware with you, but without disturbing main-line development, you could commit your change to\na new branch. Others can then checkout your experimental stuff and utilise the full benefit\nof cvs conflict resolution. The scenario might look like:\n\n\n[[ hacked sources are present ]]\n$ cvs tag -b EXPR1\n$ cvs update -r EXPR1\n$ cvs commit\n\n\n\n\nThe update command will make the -r EXPR1 option sticky on all files. Note that your changes\nto the files will never be removed by the update command. The commit will automatically com‐\nmit to the correct branch, because the -r is sticky. You could also do like this:\n\n\n[[ hacked sources are present ]]\n$ cvs tag -b EXPR1\n$ cvs commit -r EXPR1\n\n\n\n\nbut then, only those files that were changed by you will have the -r EXPR1 sticky flag. If\nyou hack away, and commit without specifying the -r EXPR1 flag, some files may accidentally\nend up on the main trunk.\n\nTo work with you on the experimental change, others would simply do\n\n\n$ cvs checkout -r EXPR1 whatevermodule\n\n\n\n\n" }, { "name": "diff, export, commit, CVS commands", "content": "diff——Show differences between revisions\n• Synopsis: diff [-lR] [-k kflag] [formatoptions] [(-r rev1[:date1] | -D date1) [-r\nrev2[:date2] | -D date2]] [files...]\n\n• Requires: working directory, repository.\n\n• Changes: nothing.\n\nThe diff command is used to compare different revisions of files. The default action is to\ncompare your working files with the revisions they were based on, and report any differ‐\nences that are found.\n\nIf any file names are given, only those files are compared. If any directories are given,\nall files under them will be compared.\n\nThe exit status for diff is different than for other cvs commands; for details see node\n'Exit status' in the CVS manual.\n\n" }, { "name": "diff options", "content": "These standard options are supported by diff (see node 'Common options' in the CVS manual,\nfor a complete description of them):\n\n\n" }, { "name": "-D", "content": "Use the most recent revision no later than date. See -r for how this affects the compari‐\nson.\n\n\n", "flag": "-D" }, { "name": "-k", "content": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual.\n\n\n", "flag": "-k" }, { "name": "-l", "content": "Local; run only in current working directory.\n\n\n", "flag": "-l" }, { "name": "-R", "content": "Examine directories recursively. This option is on by default.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Compare with revision specified by tag or, when date is specified and tag is a branch tag,\nthe version from the branch tag as it existed on date. Zero, one or two -r options can be\npresent. With no -r option, the working file will be compared with the revision it was\nbased on. With one -r, that revision will be compared to your current working file. With\ntwo -r options those two revisions will be compared (and your working file will not affect\nthe outcome in any way).\n\nOne or both -r options can be replaced by a -D date option, described above.\n\nThe following options specify the format of the output. They have the same meaning as in\nGNU diff. Most options have two equivalent names, one of which is a single letter preceded\nby -, and the other of which is a long name preceded by --.\n\n\n\n-lines\n\nShow lines (an integer) lines of context. This option does not specify an output format by\nitself; it has no effect unless it is combined with -c or -u. This option is obsolete.\nFor proper operation, patch typically needs at least two lines of context.\n\n\n", "flag": "-r" }, { "name": "-a", "content": "Treat all files as text and compare them line-by-line, even if they do not seem to be text.\n\n\n", "flag": "-a" }, { "name": "-b", "content": "Ignore trailing white space and consider all other sequences of one or more white space\ncharacters to be equivalent.\n\n\n", "flag": "-b" }, { "name": "-B", "content": "Ignore changes that just insert or delete blank lines.\n\n\n", "flag": "-B" }, { "name": "--binary", "content": "Read and write data in binary mode.\n\n\n", "long": "--binary" }, { "name": "--brief", "content": "Report only whether the files differ, not the details of the differences.\n\n\n", "long": "--brief" }, { "name": "-c", "content": "Use the context output format.\n\n\n", "flag": "-c" }, { "name": "-C", "content": "--context[=lines]\n\nUse the context output format, showing lines (an integer) lines of context, or three if\nlines is not given. For proper operation, patch typically needs at least two lines of con‐\ntext.\n\n\n\n--changed-group-format=format\n\nUse format to output a line group containing differing lines from both files in\nif-then-else format. See node 'Line group formats' in the CVS manual.\n\n\n", "flag": "-C" }, { "name": "-d", "content": "Change the algorithm to perhaps find a smaller set of changes. This makes diff slower\n(sometimes much slower).\n\n\n", "flag": "-d" }, { "name": "-e", "content": "", "flag": "-e" }, { "name": "--ed", "content": "Make output that is a valid ed script.\n\n\n", "long": "--ed" }, { "name": "--expand-tabs", "content": "Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files.\n\n\n", "long": "--expand-tabs" }, { "name": "-f", "content": "Make output that looks vaguely like an ed script but has changes in the order they appear\nin the file.\n\n\n", "flag": "-f" }, { "name": "-F", "content": "In context and unified format, for each hunk of differences, show some of the last preced‐\ning line that matches regexp.\n\n\n", "flag": "-F" }, { "name": "--forward-ed", "content": "Make output that looks vaguely like an ed script but has changes in the order they appear\nin the file.\n\n\n", "long": "--forward-ed" }, { "name": "-H", "content": "Use heuristics to speed handling of large files that have numerous scattered small changes.\n\n\n\n--horizon-lines=lines\n\nDo not discard the last lines lines of the common prefix and the first lines lines of the\ncommon suffix.\n\n\n", "flag": "-H" }, { "name": "-i", "content": "Ignore changes in case; consider upper- and lower-case letters equivalent.\n\n\n", "flag": "-i" }, { "name": "-I", "content": "Ignore changes that just insert or delete lines that match regexp.\n\n\n\n--ifdef=name\n\nMake merged if-then-else output using name.\n\n\n", "flag": "-I" }, { "name": "--ignore-all-space", "content": "Ignore white space when comparing lines.\n\n\n", "long": "--ignore-all-space" }, { "name": "--ignore-blank-lines", "content": "Ignore changes that just insert or delete blank lines.\n\n\n", "long": "--ignore-blank-lines" }, { "name": "--ignore-case", "content": "Ignore changes in case; consider upper- and lower-case to be the same.\n\n\n\n--ignore-matching-lines=regexp\n\nIgnore changes that just insert or delete lines that match regexp.\n\n\n", "long": "--ignore-case" }, { "name": "--ignore-space-change", "content": "Ignore trailing white space and consider all other sequences of one or more white space\ncharacters to be equivalent.\n\n\n", "long": "--ignore-space-change" }, { "name": "--initial-tab", "content": "Output a tab rather than a space before the text of a line in normal or context format.\nThis causes the alignment of tabs in the line to look normal.\n\n\n", "long": "--initial-tab" }, { "name": "-L", "content": "Use label instead of the file name in the context format and unified format headers.\n\n\n\n--label=label\n\nUse label instead of the file name in the context format and unified format headers.\n\n\n", "flag": "-L" }, { "name": "--left-column", "content": "Print only the left column of two common lines in side by side format.\n\n\n\n--line-format=format\n\nUse format to output all input lines in if-then-else format. See node 'Line formats' in\nthe CVS manual.\n\n\n", "long": "--left-column" }, { "name": "--minimal", "content": "Change the algorithm to perhaps find a smaller set of changes. This makes diff slower\n(sometimes much slower).\n\n\n", "long": "--minimal" }, { "name": "-n", "content": "Output RCS-format diffs; like -f except that each command specifies the number of lines af‐\nfected.\n\n\n", "flag": "-n" }, { "name": "-N", "content": "", "flag": "-N" }, { "name": "--new-file", "content": "In directory comparison, if a file is found in only one directory, treat it as present but\nempty in the other directory.\n\n\n\n--new-group-format=format\n\nUse format to output a group of lines taken from just the second file in if-then-else for‐\nmat. See node 'Line group formats' in the CVS manual.\n\n\n\n--new-line-format=format\n\nUse format to output a line taken from just the second file in if-then-else format. See\nnode 'Line formats' in the CVS manual.\n\n\n\n--old-group-format=format\n\nUse format to output a group of lines taken from just the first file in if-then-else for‐\nmat. See node 'Line group formats' in the CVS manual.\n\n\n\n--old-line-format=format\n\nUse format to output a line taken from just the first file in if-then-else format. See\nnode 'Line formats' in the CVS manual.\n\n\n", "long": "--new-file" }, { "name": "-p", "content": "Show which C function each change is in.\n\n\n", "flag": "-p" }, { "name": "--rcs", "content": "Output RCS-format diffs; like -f except that each command specifies the number of lines af‐\nfected.\n\n\n", "long": "--rcs" }, { "name": "--report-identical-files", "content": "", "long": "--report-identical-files" }, { "name": "-s", "content": "Report when two files are the same.\n\n\n", "flag": "-s" }, { "name": "--show-c-function", "content": "Show which C function each change is in.\n\n\n\n--show-function-line=regexp\n\nIn context and unified format, for each hunk of differences, show some of the last preced‐\ning line that matches regexp.\n\n\n", "long": "--show-c-function" }, { "name": "--side-by-side", "content": "Use the side by side output format.\n\n\n", "long": "--side-by-side" }, { "name": "--speed-large-files", "content": "Use heuristics to speed handling of large files that have numerous scattered small changes.\n\n\n", "long": "--speed-large-files" }, { "name": "--suppress-common-lines", "content": "Do not print common lines in side by side format.\n\n\n", "long": "--suppress-common-lines" }, { "name": "-t", "content": "Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files.\n\n\n", "flag": "-t" }, { "name": "-T", "content": "Output a tab rather than a space before the text of a line in normal or context format.\nThis causes the alignment of tabs in the line to look normal.\n\n\n", "flag": "-T" }, { "name": "--text", "content": "Treat all files as text and compare them line-by-line, even if they do not appear to be\ntext.\n\n\n", "long": "--text" }, { "name": "-u", "content": "Use the unified output format.\n\n\n\n--unchanged-group-format=format\n\nUse format to output a group of common lines taken from both files in if-then-else format.\nSee node 'Line group formats' in the CVS manual.\n\n\n\n--unchanged-line-format=format\n\nUse format to output a line common to both files in if-then-else format. See node 'Line\nformats' in the CVS manual.\n\n\n", "flag": "-u" }, { "name": "-U", "content": "--unified[=lines]\n\nUse the unified output format, showing lines (an integer) lines of context, or three if\nlines is not given. For proper operation, patch typically needs at least two lines of con‐\ntext.\n\n\n", "flag": "-U" }, { "name": "-w", "content": "Ignore white space when comparing lines.\n\n\n", "flag": "-w" }, { "name": "-W", "content": "--width=columns\n\nUse an output width of columns in side by side format.\n\n\n", "flag": "-W" }, { "name": "-y", "content": "Use the side by side output format.\n\n", "flag": "-y" }, { "name": "Line group formats", "content": "Line group formats let you specify formats suitable for many applications that allow\nif-then-else input, including programming languages and text formatting languages. A line\ngroup format specifies the output format for a contiguous group of similar lines.\n\nFor example, the following command compares the TeX file myfile with the original version\nfrom the repository, and outputs a merged file in which old regions are surrounded by \\be‐‐\ngin{em}-\\end{em} lines, and new regions are surrounded by \\begin{bf}-\\end{bf} lines.\n\n\ncvs diff \\\n\n--old-group-format='\\begin{em}\n%<\\end{em}\n' \\\n\n--new-group-format='\\begin{bf}\n%>\\end{bf}\n' \\\n\nmyfile\n\n\n\n\nThe following command is equivalent to the above example, but it is a little more verbose,\nbecause it spells out the default line group formats.\n\n\ncvs diff \\\n\n--old-group-format='\\begin{em}\n%<\\end{em}\n' \\\n\n--new-group-format='\\begin{bf}\n%>\\end{bf}\n' \\\n\n--unchanged-group-format='%=' \\\n\n--changed-group-format='\\begin{em}\n%<\\end{em}\n\\begin{bf}\n%>\\end{bf}\n' \\\n\nmyfile\n\n\n\n\nHere is a more advanced example, which outputs a diff listing with headers containing line\nnumbers in a ``plain English'' style.\n\n\ncvs diff \\\n\n--unchanged-group-format='' \\\n\n--old-group-format='-------- %dn line%(n=1?:s) deleted at %df:\n%<' \\\n\n--new-group-format='-------- %dN line%(N=1?:s) added after %de:\n%>' \\\n\n--changed-group-format='-------- %dn line%(n=1?:s) changed at %df:\n%<-------- to:\n%>' \\\n\nmyfile\n\n\n\n\nTo specify a line group format, use one of the options listed below. You can specify up to\nfour line group formats, one for each kind of line group. You should quote format, because\nit typically contains shell metacharacters.\n\n\n\n--old-group-format=format\n\nThese line groups are hunks containing only lines from the first file. The default old\ngroup format is the same as the changed group format if it is specified; otherwise it is a\nformat that outputs the line group as-is.\n\n\n\n--new-group-format=format\n\nThese line groups are hunks containing only lines from the second file. The default new\ngroup format is same as the changed group format if it is specified; otherwise it is a for‐\nmat that outputs the line group as-is.\n\n\n\n--changed-group-format=format\n\nThese line groups are hunks containing lines from both files. The default changed group\nformat is the concatenation of the old and new group formats.\n\n\n\n--unchanged-group-format=format\n\nThese line groups contain lines common to both files. The default unchanged group format\nis a format that outputs the line group as-is.\n\nIn a line group format, ordinary characters represent themselves; conversion specifications\nstart with % and have one of the following forms.\n\n\n\n%<\n\nstands for the lines from the first file, including the trailing newline. Each line is\nformatted according to the old line format (see node 'Line formats' in the CVS manual).\n\n\n\n%>\n\nstands for the lines from the second file, including the trailing newline. Each line is\nformatted according to the new line format.\n\n\n\n%=\n\nstands for the lines common to both files, including the trailing newline. Each line is\nformatted according to the unchanged line format.\n\n\n\n%%\n\nstands for %.\n\n\n\n%c'C'\n\nwhere C is a single character, stands for C. C may not be a backslash or an apostrophe.\nFor example, %c':' stands for a colon, even inside the then-part of an if-then-else format,\nwhich a colon would normally terminate.\n\n\n\n%c'\\O'\n\nwhere O is a string of 1, 2, or 3 octal digits, stands for the character with octal code O.\nFor example, %c'\\0' stands for a null character.\n\n\n\nFn\n\nwhere F is a printf conversion specification and n is one of the following letters, stands\nfor n's value formatted with F.\n\n\ne\n\nThe line number of the line just before the group in the old file.\n\n\nf\n\nThe line number of the first line in the group in the old file; equals e + 1.\n\n\nl\n\nThe line number of the last line in the group in the old file.\n\n\nm\n\nThe line number of the line just after the group in the old file; equals l + 1.\n\n\nn\n\nThe number of lines in the group in the old file; equals l - f + 1.\n\n\nE, F, L, M, N\n\nLikewise, for lines in the new file.\n\n\nThe printf conversion specification can be %d, %o, %x, or %X, specifying decimal, octal,\nlower case hexadecimal, or upper case hexadecimal output respectively. After the % the\nfollowing options can appear in sequence: a - specifying left-justification; an integer\nspecifying the minimum field width; and a period followed by an optional integer specify‐\ning the minimum number of digits. For example, %5dN prints the number of new lines in\nthe group in a field of width 5 characters, using the printf format \"%5d\".\n\n\n\n(A=B?T:E)\n\nIf A equals B then T else E. A and B are each either a decimal constant or a single letter\ninterpreted as above. This format spec is equivalent to T if A's value equals B's; other‐\nwise it is equivalent to E.\n\nFor example, %(N=0?no:%dN) line%(N=1?:s) is equivalent to no lines if N (the number of\nlines in the group in the new file) is 0, to 1 line if N is 1, and to %dN lines otherwise.\n\n" }, { "name": "Line formats", "content": "Line formats control how each line taken from an input file is output as part of a line group\nin if-then-else format.\n\nFor example, the following command outputs text with a one-column change indicator to the\nleft of the text. The first column of output is - for deleted lines, | for added lines, and\na space for unchanged lines. The formats contain newline characters where newlines are de‐\nsired on output.\n\n\ncvs diff \\\n\n--old-line-format='-%l\n' \\\n\n--new-line-format='|%l\n' \\\n\n--unchanged-line-format=' %l\n' \\\n\nmyfile\n\n\n\n\nTo specify a line format, use one of the following options. You should quote format, since\nit often contains shell metacharacters.\n\n\n\n--old-line-format=format\n\nformats lines just from the first file.\n\n\n\n--new-line-format=format\n\nformats lines just from the second file.\n\n\n\n--unchanged-line-format=format\n\nformats lines common to both files.\n\n\n\n--line-format=format\n\nformats all lines; in effect, it sets all three above options simultaneously.\n\nIn a line format, ordinary characters represent themselves; conversion specifications start\nwith % and have one of the following forms.\n\n\n\n%l\n\nstands for the contents of the line, not counting its trailing newline (if any). This for‐\nmat ignores whether the line is incomplete.\n\n\n\n%L\n\nstands for the contents of the line, including its trailing newline (if any). If a line is\nincomplete, this format preserves its incompleteness.\n\n\n\n%%\n\nstands for %.\n\n\n\n%c'C'\n\nwhere C is a single character, stands for C. C may not be a backslash or an apostrophe.\nFor example, %c':' stands for a colon.\n\n\n\n%c'\\O'\n\nwhere O is a string of 1, 2, or 3 octal digits, stands for the character with octal code O.\nFor example, %c'\\0' stands for a null character.\n\n\n\nFn\n\nwhere F is a printf conversion specification, stands for the line number formatted with F.\nFor example, %.5dn prints the line number using the printf format \"%.5d\". See node 'Line\ngroup formats' in the CVS manual, for more about printf conversion specifications.\n\n\nThe default line format is %l followed by a newline character.\n\nIf the input contains tab characters and it is important that they line up on output, you\nshould ensure that %l or %L in a line format is just after a tab stop (e.g. by preceding %l\nor %L with a tab character), or you should use the -t or --expand-tabs option.\n\nTaken together, the line and line group formats let you specify many different formats.\nFor example, the following command uses a format similar to diff's normal format. You can\ntailor this command to get fine control over diff's output.\n\n\ncvs diff \\\n\n--old-line-format='< %l\n' \\\n\n--new-line-format='> %l\n' \\\n\n--old-group-format='%df%(f=l?:,%dl)d%dE\n%<' \\\n\n--new-group-format='%dea%dF%(F=L?:,%dL)\n%>' \\\n\n--changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n%<—\n%>' \\\n\n--unchanged-group-format='' \\\n\nmyfile\n\n\n\n\n" }, { "name": "diff examples", "content": "The following line produces a Unidiff (-u flag) between revision 1.14 and 1.19 of backend.c.\nDue to the -kk flag no keywords are substituted, so differences that only depend on keyword\nsubstitution are ignored.\n\n\n$ cvs diff -kk -u -r 1.14 -r 1.19 backend.c\n\n\n\n\nSuppose the experimental branch EXPR1 was based on a set of files tagged RELEASE10. To see\nwhat has happened on that branch, the following can be used:\n\n\n$ cvs diff -r RELEASE10 -r EXPR1\n\n\n\n\nA command like this can be used to produce a context diff between two releases:\n\n\n$ cvs diff -c -r RELEASE10 -r RELEASE11 > diffs\n\n\n\n\nIf you are maintaining ChangeLogs, a command like the following just before you commit your\nchanges may help you write the ChangeLog entry. All local modifications that have not yet\nbeen committed will be printed.\n\n\n$ cvs diff -u | less\n\n\n\n\n" }, { "name": "export, history, diff, CVS commands", "content": "export——Export sources from CVS, similar to checkout\n• Synopsis: export [-flNnR] (-r rev[:date] | -D date) [-k subst] [-d dir] module...\n\n• Requires: repository.\n\n• Changes: current directory.\n\nThis command is a variant of checkout; use it when you want a copy of the source for module\nwithout the cvs administrative directories. For example, you might use export to prepare\nsource for shipment off-site. This command requires that you specify a date or tag (with\n-D or -r), so that you can count on reproducing the source you ship to others (and thus it\nalways prunes empty directories).\n\nOne often would like to use -kv with cvs export. This causes any keywords to be expanded\nsuch that an import done at some other site will not lose the keyword revision information.\nBut be aware that doesn't handle an export containing binary files correctly. Also be\naware that after having used -kv, one can no longer use the ident command (which is part of\nthe rcs suite—see ident(1)) which looks for keyword strings. If you want to be able to use\nident you must not use -kv.\n\n" }, { "name": "export options", "content": "These standard options are supported by export (see node 'Common options' in the CVS manual,\nfor a complete description of them):\n\n\n" }, { "name": "-D", "content": "Use the most recent revision no later than date.\n\n\n", "flag": "-D" }, { "name": "-f", "content": "If no matching revision is found, retrieve the most recent revision (instead of ignoring\nthe file).\n\n\n", "flag": "-f" }, { "name": "-l", "content": "Local; run only in current working directory.\n\n\n", "flag": "-l" }, { "name": "-n", "content": "Do not run any checkout program.\n\n\n", "flag": "-n" }, { "name": "-R", "content": "Export directories recursively. This is on by default.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Export the revision specified by tag or, when date is specified and tag is a branch tag,\nthe version from the branch tag as it existed on date. See node 'Common options' in the\nCVS manual.\n\nIn addition, these options (that are common to checkout and export) are also supported:\n\n\n", "flag": "-r" }, { "name": "-d", "content": "Create a directory called dir for the working files, instead of using the module name. See\nnode 'checkout options' in the CVS manual, for complete details on how cvs handles this\nflag.\n\n\n", "flag": "-d" }, { "name": "-k", "content": "Set keyword expansion mode (see node 'Substitution modes' in the CVS manual).\n\n\n", "flag": "-k" }, { "name": "-N", "content": "Only useful together with -d dir. See node 'checkout options' in the CVS manual, for com‐\nplete details on how cvs handles this flag.\n\n", "flag": "-N" }, { "name": "history, import, export, CVS commands", "content": "history——Show repository access history\n• Synopsis: history [-report] [-flags] [-options args] [files...]\n\n• Requires: the file $CVSROOT/CVSROOT/history\n\n• Changes: nothing.\n\ncvs can keep a history log that tracks each use of most cvs commands. You can use history\nto display this information in various formats.\n\nTo enable logging, the LogHistory config option must be set to some value other than the\nempty string and the history file specified by the HistoryLogPath option must be writable\nby all users who may run the cvs executable (see node 'config' in the CVS manual).\n\nTo enable the history command, logging must be enabled as above and the HistorySearchPath\nconfig option (see node 'config' in the CVS manual) must be set to specify some number of\nthe history logs created thereby and these files must be readable by each user who might\nrun the history command.\n\nCreating a repository via the cvs init command will enable logging of all possible events\nto a single history log file ($CVSROOT/CVSROOT/history) with read and write permissions for\nall users (see node 'Creating a repository' in the CVS manual).\n\nNote: history uses -f, -l, -n, and -p in ways that conflict with the normal use inside cvs\n(see node 'Common options' in the CVS manual).\n\n" }, { "name": "history options", "content": "Several options (shown above as -report) control what kind of report is generated:\n\n\n" }, { "name": "-c", "content": "Report on each time commit was used (i.e., each time the repository was modified).\n\n\n", "flag": "-c" }, { "name": "-e", "content": "Everything (all record types). Equivalent to specifying -x with all record types. Of\ncourse, -e will also include record types which are added in a future version of cvs; if\nyou are writing a script which can only handle certain record types, you'll want to specify\n-x.\n\n\n", "flag": "-e" }, { "name": "-m", "content": "Report on a particular module. (You can meaningfully use -m more than once on the command\nline.)\n\n\n", "flag": "-m" }, { "name": "-o", "content": "Report on checked-out modules. This is the default report type.\n\n\n", "flag": "-o" }, { "name": "-T", "content": "Report on all tags.\n\n\n", "flag": "-T" }, { "name": "-x", "content": "Extract a particular set of record types type from the cvs history. The types are indi‐\ncated by single letters, which you may specify in combination.\n\nCertain commands have a single record type:\n\n\nF\n\nrelease\n\nO\n\ncheckout\n\nE\n\nexport\n\nT\n\nrtag\n\nOne of five record types may result from an update:\n\n\nC\n\nA merge was necessary but collisions were detected (requiring manual merging).\n\nG\n\nA merge was necessary and it succeeded.\n\nU\n\nA working file was copied from the repository.\n\nP\n\nA working file was patched to match the repository.\n\nW\n\nThe working copy of a file was deleted during update (because it was gone from the repos‐\nitory).\n\nOne of three record types results from commit:\n\n\nA\n\nA file was added for the first time.\n\nM\n\nA file was modified.\n\nR\n\nA file was removed.\n\nThe options shown as -flags constrain or expand the report without requiring option argu‐\nments:\n\n\n", "flag": "-x" }, { "name": "-a", "content": "Show data for all users (the default is to show data only for the user executing history).\n\n\n", "flag": "-a" }, { "name": "-l", "content": "Show last modification only.\n\n\n", "flag": "-l" }, { "name": "-w", "content": "Show only the records for modifications done from the same working directory where history\nis executing.\n\nThe options shown as -options args constrain the report based on an argument:\n\n\n", "flag": "-w" }, { "name": "-b", "content": "Show data back to a record containing the string str in either the module name, the\nfile name, or the repository path.\n\n\n", "flag": "-b" }, { "name": "-D", "content": "Show data since date. This is slightly different from the normal use of -D date, which se‐\nlects the newest revision older than date.\n\n\n", "flag": "-D" }, { "name": "-f", "content": "Show data for a particular file (you can specify several -f options on the same command\nline). This is equivalent to specifying the file on the command line.\n\n\n", "flag": "-f" }, { "name": "-n", "content": "Show data for a particular module (you can specify several -n options on the same command\nline).\n\n\n", "flag": "-n" }, { "name": "-p", "content": "Show data for a particular source repository (you can specify several -p options on the\nsame command line).\n\n\n", "flag": "-p" }, { "name": "-r", "content": "Show records referring to revisions since the revision or tag named rev appears in individ‐\nual rcs files. Each rcs file is searched for the revision or tag.\n\n\n", "flag": "-r" }, { "name": "-t", "content": "Show records since tag tag was last added to the history file. This differs from the -r\nflag above in that it reads only the history file, not the rcs files, and is much faster.\n\n\n", "flag": "-t" }, { "name": "-u", "content": "Show records for user name.\n\n\n", "flag": "-u" }, { "name": "-z", "content": "Show times in the selected records using the specified time zone instead of UTC.\n\n", "flag": "-z" }, { "name": "import, log, history, CVS commands", "content": "import——Import sources into CVS, using vendor branches\n• Synopsis: import [-options] repository vendortag releasetag...\n\n• Requires: Repository, source distribution directory.\n\n• Changes: repository.\n\nUse import to incorporate an entire source distribution from an outside source (e.g., a\nsource vendor) into your source repository directory. You can use this command both for\ninitial creation of a repository, and for wholesale updates to the module from the outside\nsource. See node 'Tracking sources' in the CVS manual, for a discussion on this subject.\n\nThe repository argument gives a directory name (or a path to a directory) under the cvs\nroot directory for repositories; if the directory did not exist, import creates it.\n\nWhen you use import for updates to source that has been modified in your source repository\n(since a prior import), it will notify you of any files that conflict in the two branches\nof development; use checkout -j to reconcile the differences, as import instructs you to\ndo.\n\nIf cvs decides a file should be ignored (see node 'cvsignore' in the CVS manual), it does\nnot import it and prints I followed by the filename (see node 'import output' in the CVS\nmanual, for a complete description of the output).\n\nIf the file $CVSROOT/CVSROOT/cvswrappers exists, any file whose names match the specifica‐\ntions in that file will be treated as packages and the appropriate filtering will be per‐\nformed on the file/directory before being imported. See node 'Wrappers' in the CVS manual.\n\nThe outside source is saved in a first-level branch, by default 1.1.1. Updates are leaves\nof this branch; for example, files from the first imported collection of source will be re‐\nvision 1.1.1.1, then files from the first imported update will be revision 1.1.1.2, and so\non.\n\nAt least three arguments are required. repository is needed to identify the collection of\nsource. vendortag is a tag for the entire branch (e.g., for 1.1.1). You must also specify\nat least one releasetag to uniquely identify the files at the leaves created each time you\nexecute import. The releasetag should be new, not previously existing in the repository\nfile, and uniquely identify the imported release,\n\nNote that import does not change the directory in which you invoke it. In particular, it\ndoes not set up that directory as a cvs working directory; if you want to work with the\nsources import them first and then check them out into a different directory (see node\n'Getting the source' in the CVS manual).\n\n" }, { "name": "import options", "content": "This standard option is supported by import (see node 'Common options' in the CVS manual, for\na complete description):\n\n\n" }, { "name": "-m", "content": "Use message as log information, instead of invoking an editor.\n\nThere are the following additional special options.\n\n\n", "flag": "-m" }, { "name": "-b", "content": "See node 'Multiple vendor branches' in the CVS manual.\n\n\n", "flag": "-b" }, { "name": "-k", "content": "Indicate the keyword expansion mode desired. This setting will apply to all files created\nduring the import, but not to any files that previously existed in the repository. See\nnode 'Substitution modes' in the CVS manual, for a list of valid -k settings.\n\n\n", "flag": "-k" }, { "name": "-I", "content": "Specify file names that should be ignored during import. You can use this option repeat‐\nedly. To avoid ignoring any files at all (even those ignored by default), specify `-I !'.\n\nname can be a file name pattern of the same type that you can specify in the .cvsignore\nfile. See node 'cvsignore' in the CVS manual.\n\n\n", "flag": "-I" }, { "name": "-W", "content": "Specify file names that should be filtered during import. You can use this option repeat‐\nedly.\n\nspec can be a file name pattern of the same type that you can specify in the .cvswrappers\nfile. See node 'Wrappers' in the CVS manual.\n\n\n", "flag": "-W" }, { "name": "-X", "content": "Modify the algorithm used by cvs when importing new files so that new files do not immedi‐\nately appear on the main trunk.\n\nSpecifically, this flag causes cvs to mark new files as if they were deleted on the main\ntrunk, by taking the following steps for each file in addition to those normally taken on\nimport: creating a new revision on the main trunk indicating that the new file is dead, re‐\nsetting the new file's default branch, and placing the file in the Attic (see node 'Attic'\nin the CVS manual) directory.\n\nSetting the ImportNewFilesToVendorBranchOnly option in CVSROOT/config (see node 'config' in\nthe CVS manual) forces use of this option on a repository-wide basis.\n\n", "flag": "-X" }, { "name": "import output", "content": "import keeps you informed of its progress by printing a line for each file, preceded by one\ncharacter indicating the status of the file:\n\n\n\nU file\n\nThe file already exists in the repository and has not been locally modified; a new revision\nhas been created (if necessary).\n\n\n\nN file\n\nThe file is a new file which has been added to the repository.\n\n\n\nC file\n\nThe file already exists in the repository but has been locally modified; you will have to\nmerge the changes.\n\n\n\nI file\n\nThe file is being ignored (see node 'cvsignore' in the CVS manual).\n\n\n\nL file\n\nThe file is a symbolic link; cvs import ignores symbolic links. People periodically sug‐\ngest that this behavior should be changed, but if there is a consensus on what it should be\nchanged to, it is not apparent. (Various options in the modules file can be used to recre‐\nate symbolic links on checkout, update, etc.; see node 'modules' in the CVS manual.)\n\n" }, { "name": "import examples", "content": "See node 'Tracking sources' in the CVS manual, and node 'From files' in the CVS manual.\n\n" }, { "name": "log, ls & rls, import, CVS commands", "content": "log——Print out history information for files\n• Synopsis: log [options] [files...]\n\nrlog [options] [files...]\n\n• Requires: repository, working directory.\n\n• Changes: nothing.\n\nDisplay log information for files. log used to call the rcs utility rlog. Although this\nis no longer true in the current sources, this history determines the format of the output\nand the options, which are not quite in the style of the other cvs commands.\n\nThe output includes the location of the rcs file, the head revision (the latest revision on\nthe trunk), all symbolic names (tags) and some other things. For each revision, the revi‐\nsion number, the date, the author, the number of lines added/deleted, the commitid and the\nlog message are printed. All dates are displayed in local time at the client. This is typ‐\nically specified in the $TZ environment variable, which can be set to govern how log dis‐\nplays dates.\n\nNote: log uses -R in a way that conflicts with the normal use inside cvs (see node 'Common\noptions' in the CVS manual).\n\n" }, { "name": "log options", "content": "By default, log prints all information that is available. All other options restrict the\noutput. Note that the revision selection options (-d, -r, -s, and -w) have no effect, other\nthan possibly causing a search for files in Attic directories, when used in conjunction with\nthe options that restrict the output to only log header fields (-b, -h, -R, and -t) unless\nthe -S option is also specified.\n\n\n" }, { "name": "-b", "content": "Print information about the revisions on the default branch, normally the highest branch on\nthe trunk.\n\n\n", "flag": "-b" }, { "name": "-d", "content": "Print information about revisions with a checkin date/time in the range given by the semi‐\ncolon-separated list of dates. The date formats accepted are those accepted by the -D op‐\ntion to many other cvs commands (see node 'Common options' in the CVS manual). Dates can\nbe combined into ranges as follows:\n\n\nd1d1\n\nSelect the revisions that were deposited between d1 and d2.\n\n\n\n\nSelect all revisions dated d or earlier.\n\n\nd<\n\n\n\n>d\n\nSelect all revisions dated d or later.\n\n\nd\n\nSelect the single, latest revision dated d or earlier.\n\nThe > or < characters may be followed by = to indicate an inclusive range rather than an\nexclusive one.\n\nNote that the separator is a semicolon (;).\n\n\n", "flag": "-d" }, { "name": "-h", "content": "Print only the name of the rcs file, name of the file in the working directory, head, de‐\nfault branch, access list, locks, symbolic names, and suffix.\n\n\n", "flag": "-h" }, { "name": "-l", "content": "Local; run only in current working directory. (Default is to run recursively).\n\n\n", "flag": "-l" }, { "name": "-N", "content": "Do not print the list of tags for this file. This option can be very useful when your site\nuses a lot of tags, so rather than \"more\"'ing over 3 pages of tag information, the log in‐\nformation is presented without tags at all.\n\n\n", "flag": "-N" }, { "name": "-R", "content": "Print only the name of the rcs file.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Print information about revisions given in the comma-separated list revisions of revisions\nand ranges. The following table explains the available range formats:\n\n\nrev1:rev2\n\nRevisions rev1 to rev2 (which must be on the same branch).\n\n\nrev1::rev2\n\nThe same, but excluding rev1.\n\n\n:rev\n\n\n\n::rev\n\nRevisions from the beginning of the branch up to and including rev.\n\n\nrev:\n\nRevisions starting with rev to the end of the branch containing rev.\n\n\nrev::\n\nRevisions starting just after rev to the end of the branch containing rev.\n\n\nbranch\n\nAn argument that is a branch means all revisions on that branch.\n\n\nbranch1:branch2\n\n\n\nbranch1::branch2\n\nA range of branches means all revisions on the branches in that range.\n\n\nbranch.\n\nThe latest revision in branch.\n\nA bare -r with no revisions means the latest revision on the default branch, normally the\ntrunk. There can be no space between the -r option and its argument.\n\n\n", "flag": "-r" }, { "name": "-S", "content": "Suppress the header if no revisions are selected.\n\n\n", "flag": "-S" }, { "name": "-s", "content": "Print information about revisions whose state attributes match one of the states given in\nthe comma-separated list states. Individual states may be any text string, though cvs com‐\nmonly only uses two states, Exp and dead. See node 'admin options' in the CVS manual for\nmore information.\n\n\n", "flag": "-s" }, { "name": "-t", "content": "Print the same as -h, plus the descriptive text.\n\n\n", "flag": "-t" }, { "name": "-w", "content": "Print information about revisions checked in by users with login names appearing in the\ncomma-separated list logins. If logins is omitted, the user's login is assumed. There can\nbe no space between the -w option and its argument.\n\nlog prints the intersection of the revisions selected with the options -d, -s, and -w, in‐\ntersected with the union of the revisions selected by -b and -r.\n\n", "flag": "-w" }, { "name": "log examples", "content": "Since log shows dates in local time, you might want to see them in Coordinated Universal Time\n(UTC) or some other timezone. To do this you can set your $TZ environment variable before\ninvoking cvs:\n\n\n$ TZ=UTC cvs log foo.c\n$ TZ=EST cvs log bar.c\n\n\n\n\n(If you are using a csh-style shell, like tcsh, you would need to prefix the examples above\nwith env.)\n\n" }, { "name": "ls & rls", "content": "" }, { "name": "List files in the repository", "content": "• ls [-e | -l] [-RP] [-r tag[:date]] [-D date] [path...]\n\nrls [-e | -l] [-RP] [-r tag[:date]] [-D date] [path...]\n\n• Requires: repository for rls, repository & working directory for ls.\n\n• Changes: nothing.\n\n• Synonym: dir & list are synonyms for ls and rdir & rlist are synonyms for rls.\n\nThe ls and rls commands are used to list files and directories in the repository.\n\nBy default ls lists the files and directories that belong in your working directory, what\nwould be there after an update.\n\nBy default rls lists the files and directories on the tip of the trunk in the topmost di‐\nrectory of the repository.\n\nBoth commands accept an optional list of file and directory names, relative to the working\ndirectory for ls and the topmost directory of the repository for rls. Neither is recursive\nby default.\n\n" }, { "name": "ls & rls options", "content": "These standard options are supported by ls & rls:\n\n\n" }, { "name": "-d", "content": "Show dead revisions (with tag when specified).\n\n\n", "flag": "-d" }, { "name": "-e", "content": "Display in CVS/Entries format. This format is meant to remain easily parsable by automa‐\ntion.\n\n\n", "flag": "-e" }, { "name": "-l", "content": "Display all details.\n\n\n", "flag": "-l" }, { "name": "-P", "content": "Don't list contents of empty directories when recursing.\n\n\n", "flag": "-P" }, { "name": "-R", "content": "List recursively.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Show files specified by tag or, when date is specified and tag is a branch tag, the version\nfrom the branch tag as it existed on date. See node 'Common options' in the CVS manual.\n\n\n", "flag": "-r" }, { "name": "-D", "content": "Show files from date.\n\n", "flag": "-D" }, { "name": "rls examples", "content": "$ cvs rls\ncvs rls: Listing module: `.'\nCVSROOT\nfirst-dir\n\n\n\n\n\n$ cvs rls CVSROOT\ncvs rls: Listing module: `CVSROOT'\ncheckoutlist\ncommitinfo\nconfig\ncvswrappers\nloginfo\nmodules\nnotify\nrcsinfo\ntaginfo\nverifymsg\n\n\n\n\n\n" }, { "name": "rdiff, release, ls & rls, CVS commands", "content": "rdiff——Create 'patch' format diffs between revisions\n• rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules...\n\n• Requires: repository.\n\n• Changes: nothing.\n\n• Synonym: patch\n\nBuilds a Larry Wall format patch(1) file between two releases, that can be fed directly\ninto the patch program to bring an old release up-to-date with the new release. (This is\none of the few cvs commands that operates directly from the repository, and doesn't require\na prior checkout.) The diff output is sent to the standard output device.\n\nYou can specify (using the standard -r and -D options) any combination of one or two revi‐\nsions or dates. If only one revision or date is specified, the patch file reflects differ‐\nences between that revision or date and the current head revisions in the rcs file.\n\nNote that if the software release affected is contained in more than one directory, then it\nmay be necessary to specify the -p option to the patch command when patching the old\nsources, so that patch is able to find the files that are located in other directories.\n\n" }, { "name": "rdiff options", "content": "These standard options are supported by rdiff (see node 'Common options' in the CVS manual,\nfor a complete description of them):\n\n\n" }, { "name": "-D", "content": "Use the most recent revision no later than date.\n\n\n", "flag": "-D" }, { "name": "-f", "content": "If no matching revision is found, retrieve the most recent revision (instead of ignoring\nthe file).\n\n\n", "flag": "-f" }, { "name": "-k", "content": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual.\n\n\n", "flag": "-k" }, { "name": "-l", "content": "Local; don't descend subdirectories.\n\n\n", "flag": "-l" }, { "name": "-R", "content": "Examine directories recursively. This option is on by default.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Use the revision specified by tag, or when date is specified and tag is a branch tag, the\nversion from the branch tag as it existed on date. See node 'Common options' in the CVS\nmanual.\n\nIn addition to the above, these options are available:\n\n\n", "flag": "-r" }, { "name": "-c", "content": "Use the context diff format. This is the default format.\n\n\n", "flag": "-c" }, { "name": "-p", "content": "Show which C function each change is in.\n\n\n", "flag": "-p" }, { "name": "-s", "content": "Create a summary change report instead of a patch. The summary includes information about\nfiles that were changed or added between the releases. It is sent to the standard output\ndevice. This is useful for finding out, for example, which files have changed between two\ndates or revisions.\n\n\n", "flag": "-s" }, { "name": "-t", "content": "A diff of the top two revisions is sent to the standard output device. This is most useful\nfor seeing what the last change to a file was.\n\n\n", "flag": "-t" }, { "name": "-u", "content": "Use the unidiff format for the context diffs. Remember that old versions of the patch pro‐\ngram can't handle the unidiff format, so if you plan to post this patch to the net you\nshould probably not use -u.\n\n\n", "flag": "-u" }, { "name": "-V", "content": "Expand keywords according to the rules current in rcs version vn (the expansion format\nchanged with rcs version 5). Note that this option is no longer accepted. cvs will always\nexpand keywords the way that rcs version 5 does.\n\n", "flag": "-V" }, { "name": "rdiff examples", "content": "Suppose you receive mail from foo@example.net asking for an update from release 1.2 to 1.4 of\nthe tc compiler. You have no such patches on hand, but with cvs that can easily be fixed\nwith a command such as this:\n\n\n$ cvs rdiff -c -r FOO12 -r FOO14 tc | \\\n$$ Mail -s 'The patches you asked for' foo@example.net\n\n\n\n\nSuppose you have made release 1.3, and forked a branch called R13fix for bug fixes.\nR131 corresponds to release 1.3.1, which was made some time ago. Now, you want to see how\nmuch development has been done on the branch. This command can be used:\n\n\n$ cvs patch -s -r R131 -r R13fix module-name\ncvs rdiff: Diffing module-name\nFile ChangeLog,v changed from revision 1.52.2.5 to 1.52.2.6\nFile foo.c,v changed from revision 1.52.2.3 to 1.52.2.4\nFile bar.h,v changed from revision 1.29.2.1 to 1.2\n\n\n\n\n" }, { "name": "release, server & pserver, rdiff, CVS commands", "content": "release——Indicate that a directory is no longer in use\n• release [-d] directories...\n\n• Requires: Working directory.\n\n• Changes: Working directory, history log.\n\nThis command is meant to safely cancel the effect of cvs checkout. Since cvs doesn't lock\nfiles, it isn't strictly necessary to use this command. You can always simply delete your\nworking directory, if you like; but you risk losing changes you may have forgotten, and you\nleave no trace in the cvs history file (see node 'history file' in the CVS manual) that\nyou've abandoned your checkout.\n\nUse cvs release to avoid these problems. This command checks that no uncommitted changes\nare present; that you are executing it from immediately above a cvs working directory; and\nthat the repository recorded for your files is the same as the repository defined in the\nmodule database.\n\nIf all these conditions are true, cvs release leaves a record of its execution (attesting\nto your intentionally abandoning your checkout) in the cvs history log.\n\n" }, { "name": "release options", "content": "The release command supports one command option:\n\n\n" }, { "name": "-d", "content": "Delete your working copy of the file if the release succeeds. If this flag is not given\nyour files will remain in your working directory.\n\nWARNING: The release command deletes all directories and files recursively. This has the\nvery serious side-effect that any directory that you have created inside your checked-out\nsources, and not added to the repository (using the add command; see node 'Adding files' in\nthe CVS manual) will be silently deleted—even if it is non-empty!\n\n", "flag": "-d" }, { "name": "release output", "content": "Before release releases your sources it will print a one-line message for any file that is\nnot up-to-date.\n\n\n\nU file\n\n\n\n\nP file\n\nThere exists a newer revision of this file in the repository, and you have not modified\nyour local copy of the file (U and P mean the same thing).\n\n\n\nA file\n\nThe file has been added to your private copy of the sources, but has not yet been committed\nto the repository. If you delete your copy of the sources this file will be lost.\n\n\n\nR file\n\nThe file has been removed from your private copy of the sources, but has not yet been re‐\nmoved from the repository, since you have not yet committed the removal. See node 'commit'\nin the CVS manual.\n\n\n\nM file\n\nThe file is modified in your working directory. There might also be a newer revision in‐\nside the repository.\n\n\n\n? file\n\nfile is in your working directory, but does not correspond to anything in the source repos‐\nitory, and is not in the list of files for cvs to ignore (see the description of the -I op‐\ntion, and see node 'cvsignore' in the CVS manual). If you remove your working sources,\nthis file will be lost.\n\n" }, { "name": "release examples", "content": "Release the tc directory, and delete your local working copy of the files.\n\n\n$ cd .. # You must stand immediately above the\n\n# sources when you issue cvs release.\n$ cvs release -d tc\nYou have [0] altered files in this repository.\nAre you sure you want to release (and delete) directory `tc': y\n$\n\n\n\n\n" }, { "name": "server & pserver", "content": "" }, { "name": "Act as a server for a client on stdin/stdout", "content": "• pserver [-c path]\n\nserver [-c path]\n\n• Requires: repository, client conversation on stdin/stdout\n\n• Changes: Repository or, indirectly, client working directory.\n\nThe cvs server and pserver commands are used to provide repository access to remote clients\nand expect a client conversation on stdin & stdout. Typically these commands are launched\nfrom inetd or via ssh (see node 'Remote repositories' in the CVS manual).\n\nserver expects that the client has already been authenticated somehow, typically via ssh,\nand pserver attempts to authenticate the client itself.\n\nOnly one option is available with the server and pserver commands:\n\n\n" }, { "name": "-c path", "content": "Load configuration from the given path rather than from the default location $CVSROOT/CVS‐‐\nROOT/config (see node 'config' in the CVS manual). path must be /etc/cvs.conf or prefixed\nby /etc/cvs/. This option is supported beginning with cvs release 1.12.13.\n\n", "flag": "-c" }, { "name": "suck, update, server & pserver, CVS commands", "content": "suck——Download RCS ,v file raw\n• suck module/pa/th\n\n• Requires: repository\n\nLocates the file module/pa/th,v or module/pa/Attic/th,v and downloads it raw as RCS comma-v\nfile.\n\nOutput consists of the real pathname of the comma-v file, relative to the CVS repository,\nfollowed by a newline and the binary file content immediately thereafter.\n\n" }, { "name": "update, , suck, CVS commands", "content": "update——Bring work tree in sync with repository\n• update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W\nspec] files...\n\n• Requires: repository, working directory.\n\n• Changes: working directory.\n\nAfter you've run checkout to create your private copy of source from the common repository,\nother developers will continue changing the central source. From time to time, when it is\nconvenient in your development process, you can use the update command from within your\nworking directory to reconcile your work with any revisions applied to the source reposi‐\ntory since your last checkout or update. Without the -C option, update will also merge any\ndifferences between the local copy of files and their base revisions into any destination\nrevisions specified with -r, -D, or -A.\n\n" }, { "name": "update options", "content": "These standard options are available with update (see node 'Common options' in the CVS man‐\nual, for a complete description of them):\n\n\n" }, { "name": "-D date", "content": "Use the most recent revision no later than date. This option is sticky, and implies -P.\nSee node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates.\n\n\n", "flag": "-D" }, { "name": "-f", "content": "Only useful with the -D or -r flags. If no matching revision is found, retrieve the most\nrecent revision (instead of ignoring the file).\n\n\n", "flag": "-f" }, { "name": "-k", "content": "Process keywords according to kflag. See node 'Keyword substitution' in the CVS manual.\nThis option is sticky; future updates of this file in this working directory will use the\nsame kflag. The status command can be viewed to see the sticky options. See node 'Invok‐\ning CVS' in the CVS manual, for more information on the status command.\n\n\n", "flag": "-k" }, { "name": "-l", "content": "Local; run only in current working directory. See node 'Recursive behavior' in the CVS\nmanual.\n\n\n", "flag": "-l" }, { "name": "-P", "content": "Prune empty directories. See node 'Moving directories' in the CVS manual.\n\n\n", "flag": "-P" }, { "name": "-p", "content": "Pipe files to the standard output.\n\n\n", "flag": "-p" }, { "name": "-R", "content": "Update directories recursively (default). See node 'Recursive behavior' in the CVS manual.\n\n\n", "flag": "-R" }, { "name": "-r", "content": "Retrieve the revisions specified by tag or, when date is specified and tag is a branch tag,\nthe version from the branch tag as it existed on date. This option is sticky, and implies\n-P. See node 'Sticky tags' in the CVS manual, for more information on sticky tags/dates.\nAlso see node 'Common options' in the CVS manual.\n\nThese special options are also available with update.\n\n\n", "flag": "-r" }, { "name": "-A", "content": "Reset any sticky tags, dates, or -k options. See node 'Sticky tags' in the CVS manual, for\nmore information on sticky tags/dates.\n\n\n", "flag": "-A" }, { "name": "-C", "content": "Overwrite locally modified files with clean copies from the repository (the modified file\nis saved in .#file.revision, however).\n\n\n", "flag": "-C" }, { "name": "-d", "content": "Create any directories that exist in the repository if they're missing from the working di‐\nrectory. Normally, update acts only on directories and files that were already enrolled in\nyour working directory.\n\nThis is useful for updating directories that were created in the repository since the ini‐\ntial checkout; but it has an unfortunate side effect. If you deliberately avoided certain\ndirectories in the repository when you created your working directory (either through use\nof a module name or by listing explicitly the files and directories you wanted on the com‐\nmand line), then updating with -d will create those directories, which may not be what you\nwant.\n\n\n", "flag": "-d" }, { "name": "-I", "content": "Ignore files whose names match name (in your working directory) during the update. You can\nspecify -I more than once on the command line to specify several files to ignore. Use -I !\nto avoid ignoring any files at all. See node 'cvsignore' in the CVS manual, for other ways\nto make cvs ignore some files.\n\n\n", "flag": "-I" }, { "name": "-W", "content": "Specify file names that should be filtered during update. You can use this option repeat‐\nedly.\n\nspec can be a file name pattern of the same type that you can specify in the .cvswrappers\nfile. See node 'Wrappers' in the CVS manual.\n\n\n", "flag": "-W" }, { "name": "-j", "content": "With two -j options, merge changes from the revision specified with the first -j option to\nthe revision specified with the second j option, into the working directory.\n\nWith one -j option, merge changes from the ancestor revision to the revision specified with\nthe -j option, into the working directory. The ancestor revision is the common ancestor of\nthe revision which the working directory is based on, and the revision specified in the -j\noption.\n\nNote that using a single -j tagname option rather than -j branchname to merge changes from\na branch will often not remove files which were removed on the branch. See node 'Merging\nadds and removals' in the CVS manual, for more.\n\nIn addition, each -j option can contain an optional date specification which, when used\nwith branches, can limit the chosen revision to one within a specific date. An optional\ndate is specified by adding a colon (:) to the tag: -jSymbolicTag:DateSpecifier.\n\nSee node 'Branching and merging' in the CVS manual.\n\n\n", "flag": "-j" }, { "name": "update output", "content": "update and checkout keep you informed of their progress by printing a line for each file,\npreceded by one character indicating the status of the file:\n\n\n\nU file\n\nThe file was brought up to date with respect to the repository. This is done for any file\nthat exists in the repository but not in your working directory, and for files that you\nhaven't changed but are not the most recent versions available in the repository.\n\n\n\nP file\n\nLike U, but the cvs server sends a patch instead of an entire file. This accomplishes the\nsame thing as U using less bandwidth.\n\n\n\nA file\n\nThe file has been added to your private copy of the sources, and will be added to the\nsource repository when you run commit on the file. This is a reminder to you that the file\nneeds to be committed.\n\n\n\nR file\n\nThe file has been removed from your private copy of the sources, and will be removed from\nthe source repository when you run commit on the file. This is a reminder to you that the\nfile needs to be committed.\n\n\n\nM file\n\nThe file is modified in your working directory.\n\nM can indicate one of two states for a file you're working on: either there were no modifi‐\ncations to the same file in the repository, so that your file remains as you last saw it;\nor there were modifications in the repository as well as in your copy, but they were merged\nsuccessfully, without conflict, in your working directory.\n\ncvs will print some messages if it merges your work, and a backup copy of your working file\n(as it looked before you ran update) will be made. The exact name of that file is printed\nwhile update runs.\n\n\n\nC file\n\nA conflict was detected while trying to merge your changes to file with changes from the\nsource repository. file (the copy in your working directory) is now the result of attempt‐\ning to merge the two revisions; an unmodified copy of your file is also in your working di‐\nrectory, with the name .#file.revision where revision is the revision that your modified\nfile started from. Resolve the conflict as described in node 'Conflicts example' in the\nCVS manual. (Note that some systems automatically purge files that begin with .# if they\nhave not been accessed for a few days. If you intend to keep a copy of your original file,\nit is a very good idea to rename it.) Under vms, the file name starts with rather than\n.#.\n\n\n\n? file\n\nfile is in your working directory, but does not correspond to anything in the source repos‐\nitory, and is not in the list of files for cvs to ignore (see the description of the -I op‐\ntion, and see node 'cvsignore' in the CVS manual).\n" } ] }, "AUTHORS": { "content": "Dick Grune\nOriginal author of the cvs shell script version posted to comp.sources.unix in the\nvolume6 release of December, 1986. Credited with much of the cvs conflict resolution\nalgorithms.\n\nBrian Berliner\nCoder and designer of the cvs program itself in April, 1989, based on the original\nwork done by Dick.\n\nJeff Polk\nHelped Brian with the design of the cvs module and vendor branch support and author of\nthe checkin(1) shell script (the ancestor of cvs import).\n\nLarry Jones, Derek R. Price, and Mark D. Baushke\nHave helped maintain cvs for many years.\n\nAnd many others too numerous to mention here.\n", "subsections": [] }, "SEE ALSO": { "content": "The most comprehensive manual for CVS is Version Management with CVS by Per Cederqvist et al.\n(see NOTE at top).\n\nFor CVS updates, more information on documentation, software related to CVS, development of\nCVS, and more, see:\n\nhttp://www.nongnu.org/cvs/\n\nci(1), co(1), cvs(5), cvsbug(8), diff(1), grep(1), patch(1), rcs(1), rcsdiff(1), rcsin‐‐\ntro(1), rcsmerge(1), rlog(1), reformat(7).\n\n\n\nCVS(1)", "subsections": [] } } } }