Module Name: src
Committed By: gutteridge
Date: Wed May 1 02:15:07 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo
Log Message:
cvs.1 & cvs.texinfo: add various small corrections
Add various corrections mostly sourced from upstream's cvs.texinfo,
e.g., note NetBSD's local change to log admin commands in history
(subsequently added on upstream's HEAD, since it was noted in
r. 1.689), add some references to rannotate and rlog (from r. 1.686),
some amendments concerning rdiff (from r. 1.687), and miscellaneous
typo fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/dist/doc/cvs.texinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.9 src/external/gpl2/xcvs/dist/doc/cvs.1:1.10
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.9 Sun Apr 28 07:13:16 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1 Wed May 1 02:15:07 2019
@@ -1098,7 +1098,7 @@ acceptable for \fIstate\fR. A useful se
stable), and \fBRel\fR (for released). By default,
the state of a new revision is set to \fBExp\fR when
it is created. The state is visible in the output from
-\fIcvs log\fR (see node `log\(aq in the CVS manual), and in the
+\fIcvs log\fR (see node `log & rlog\(aq in the CVS manual), and in the
\fB$\fP\fPLog$\fR and \fB$\fP\fPState$\fR keywords
(see node `Keyword substitution\(aq in the CVS manual). Note that \fBcvs\fR
uses the \fBdead\fR state for its own purposes (see node `Attic\(aq in the CVS manual); to
@@ -1113,7 +1113,7 @@ Useful with \fBcvs\fR. Write descriptiv
contents of the named \fIfile\fR into the RCS file,
deleting the existing text. The \fIfile\fR pathname
may not begin with \fB-\fR. The descriptive text can be seen in the
-output from \fBcvs log\fR (see node `log\(aq in the CVS manual).
+output from \fBcvs log\fR (see node `log & rlog\(aq in the CVS manual).
There can be no space between \fB-t\fR and its argument.
.SP
If \fIfile\fR is omitted,
@@ -1171,9 +1171,10 @@ files. However, \fBcvs\fR has always re
this option has never done anything useful.
.SP
.SP
-.SH "annotate"
+.SH "annotate & rannotate"
.SS "What revision modified each line of a file?"
.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: annotate [options] files\&...
@@ -1225,6 +1226,8 @@ existed on \fIdate\fR. See see node `Co
Annotate file as of specified date.
.SP
.SH "annotate example"
+.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
.SP
For example:
.SP
@@ -1511,6 +1514,7 @@ $ cvs checkout -D yesterday tc
.SH "commit"
.SS "Check files into the repository"
.IX "commit (subcommand)"
+.IX "ci (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: commit [-lnRf] [-m \(aqlog_message\(aq |
@@ -1550,7 +1554,7 @@ enter a log message that will be written
logging programs (see node `modules\(aq in the CVS manual, and see node `loginfo\(aq in the CVS manual)
and placed in the \fBrcs\fR file inside the
repository. This log message can be retrieved with the
-\fBlog\fR command; see see node `log\(aq in the CVS manual. You can specify the
+\fBlog\fR command (see node `log & rlog\(aq in the CVS manual). You can specify the
log message on the command line with the \fB-m
\fImessage\fB\fR option, and thus avoid the editor invocation,
or use the \fB-F \fIfile\fB\fR option to specify
@@ -1559,8 +1563,8 @@ that the argument file contains the log
At \fBcommit\fR, a unique commitid is placed in the \fBrcs\fR
file inside the repository. All files committed at once
get the same commitid. The commitid can be retrieved with
-the \fBlog\fR and \fBstatus\fR command; see see node `log\(aq in the CVS manual,
-see node `File status\(aq in the CVS manual.
+the \fBlog\fR and \fBstatus\fR command (see node `log & rlog\(aq in the CVS manual,
+see node `File status\(aq in the CVS manual).
.SP
.SH "commit options"
.SP
@@ -2821,6 +2825,12 @@ A file was modified.
.IP "" 4
A file was removed.
.SP
+One record type results from the admin command:
+.IP "" 2
+\fBX\fR
+.IP "" 4
+The admin command.
+.SP
The options shown as \fB-flags\fR constrain or expand
the report without requiring option arguments:
.SP
@@ -3117,9 +3127,10 @@ $ cvs -d /usr/local/cvsroot init
.PD
.IP "" 0
.SP
-.SH "log"
+.SH "log & rlog"
.SS "Print out log information for files"
.IX "log (subcommand)"
+.IX "rlog (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: log [options] [files\&...]
@@ -3488,7 +3499,7 @@ verifymsg
.IX "rdiff (subcommand)"
.SP
.IP "\(bu" 2
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules\&...
+rdiff [options] {-r tag1[:date1] | -D date1} [-r tag2[:date2] | -D date2] modules\&...
.IP "\(bu" 2
Requires: repository.
.IP "\(bu" 2
@@ -3499,10 +3510,7 @@ Synonym: patch
Builds a Larry Wall format patch(1) file between two
releases, that can be fed directly into the \fBpatch\fR
program to bring an old release up-to-date with the new
-release. (This is one of the few \fBcvs\fR commands that
-operates directly from the repository, and doesn\(aqt
-require a prior checkout.) The diff output is sent to
-the standard output device.
+release. The diff output is sent to the standard output device.
.SP
You can specify (using the standard \fB-r\fR and
\fB-D\fR options) any combination of one or two
@@ -3511,11 +3519,11 @@ specified, the patch file reflects diffe
that revision or date and the current head revisions in
the \fBrcs\fR file.
.SP
-Note that if the software release affected is contained
-in more than one directory, then it may be necessary to
-specify the \fB-p\fR option to the \fBpatch\fR command when
-patching the old sources, so that \fBpatch\fR is able to find
-the files that are located in other directories.
+Note that if the patch created by rdiff spans multiple directories,
+then it may be necessary to specify the \fB-p\fR option when feeding
+the patch back to the \fBpatch\fR command, so that \fBpatch\fR is able
+to update files that are located in directories other than the one
+patch is run in.
.SP
.SH "rdiff options"
.SP
@@ -3595,15 +3603,6 @@ of the \fBpatch\fR program can\(aqt hand
format, so if you plan to post this patch to the net
you should probably not use \fB-u\fR.
.SP
-.IP "" 0
-\fB-V \fIvn\fB\fR
-.IP "" 2
-Expand keywords according to the rules current in
-\fBrcs\fR version \fIvn\fR (the expansion format changed with
-\fBrcs\fR version 5). Note that this option is no
-longer accepted. \fBcvs\fR will always expand keywords the
-way that \fBrcs\fR version 5 does.
-.SP
.SH "rdiff examples"
.SP
Suppose you receive mail from \fr...@example.net\fR asking for an
@@ -4078,7 +4077,7 @@ Do not execute the tag program specified
.IX "update (subcommand)"
.SP
.IP "\(bu" 2
-update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files\&...
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] [files\&...]
.IP "\(bu" 2
Requires: repository, working directory.
.IP "\(bu" 2
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.10 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.11
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.10 Sun Apr 28 07:13:16 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Wed May 1 02:15:07 2019
@@ -3300,7 +3300,7 @@ be done in a couple of different ways.
@c -- The contributed scripts
@menu
* From files:: This method is useful with old projects
- where files already exists.
+ where files already exist.
* From other version control systems:: Old projects where you want to
preserve history from another system.
* From scratch:: Creating a directory tree from scratch.
@@ -5036,7 +5036,7 @@ directory.
@c changing right away.
Unlike most other commands, the @code{add} command is
-not recursive. You have to expcicitly name files and
+not recursive. You have to explicitly name files and
directories that you wish to add to the repository.
However, each directory will need to be added
separately before you will be able to add new files
@@ -5615,7 +5615,7 @@ Whenever you commit a file you specify a
@c greatly shrink the "log" node.
To look through the log messages which have been
specified for every revision which has been committed,
-use the @code{cvs log} command (@pxref{log}).
+use the @code{cvs log} command (@pxref{log & rlog}).
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node history database
@@ -8103,7 +8103,7 @@ reference to @sc{cvs} commands, @pxref{I
* Date input formats:: Acceptable formats for date specifications
* add:: Add files and directories to the repository
* admin:: Administration
-* annotate:: What revision modified each line of a file?
+* annotate & rannotate:: What revision modified each line of a file?
* checkout:: Checkout sources for editing
* commit:: Check files into the repository
* diff:: Show differences between revisions
@@ -8111,7 +8111,7 @@ reference to @sc{cvs} commands, @pxref{I
* history:: Show status of files and users
* import:: Import sources into CVS, using vendor branches
* init:: Initialize a repository
-* log:: Show log messages for files
+* log & rlog:: Show log messages for files
* ls & rls:: List files in the repository
* rdiff:: 'patch' format diffs between releases
* release:: Indicate that a directory is no longer in use
@@ -9138,7 +9138,7 @@ acceptable for @var{state}. A useful se
stable), and @samp{Rel} (for released). By default,
the state of a new revision is set to @samp{Exp} when
it is created. The state is visible in the output from
-@var{cvs log} (@pxref{log}), and in the
+@var{cvs log} (@pxref{log & rlog}), and in the
@samp{$@splitrcskeyword{Log}$} and @samp{$@splitrcskeyword{State}$} keywords
(@pxref{Keyword substitution}). Note that @sc{cvs}
uses the @code{dead} state for its own purposes (@pxref{Attic}); to
@@ -9151,7 +9151,7 @@ Useful with @sc{cvs}. Write descriptive
contents of the named @var{file} into the RCS file,
deleting the existing text. The @var{file} pathname
may not begin with @samp{-}. The descriptive text can be seen in the
-output from @samp{cvs log} (@pxref{log}).
+output from @samp{cvs log} (@pxref{log & rlog}).
There can be no space between @samp{-t} and its argument.
If @var{file} is omitted,
@@ -9209,9 +9209,10 @@ this option has never done anything usef
@end table
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-@node annotate
-@appendixsec annotate---What revision modified each line of a file?
+@node annotate & rannotate
+@appendixsec annotate & rannotate---What revision modified each line of a file?
@cindex annotate (subcommand)
+@cindex rannotate (subcommand)
@itemize @bullet
@item
@@ -9264,6 +9265,8 @@ Annotate file as of specified date.
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node annotate example
@appendixsubsec annotate example
+@cindex annotate (subcommand)
+@cindex rannotate (subcommand)
For example:
@@ -9532,6 +9535,7 @@ $ cvs checkout -D yesterday tc
@node commit
@appendixsec commit---Check files into the repository
@cindex commit (subcommand)
+@cindex ci (subcommand)
@itemize @bullet
@item
@@ -9573,7 +9577,7 @@ enter a log message that will be written
logging programs (@pxref{modules}, and @pxref{loginfo})
and placed in the @sc{rcs} file inside the
repository. This log message can be retrieved with the
-@code{log} command; see @ref{log}. You can specify the
+@code{log} command (@pxref{log & rlog}). You can specify the
log message on the command line with the @samp{-m
@var{message}} option, and thus avoid the editor invocation,
or use the @samp{-F @var{file}} option to specify
@@ -9582,8 +9586,8 @@ that the argument file contains the log
At @code{commit}, a unique commitid is placed in the @sc{rcs}
file inside the repository. All files committed at once
get the same commitid. The commitid can be retrieved with
-the @code{log} and @code{status} command; see @ref{log},
-@ref{File status}.
+the @code{log} and @code{status} command (@pxref{log & rlog},
+@pxref{File status}).
@menu
* commit options:: commit options
@@ -10590,6 +10594,13 @@ A file was modified.
@item R
A file was removed.
@end table
+
+@noindent
+One record type results from the admin command:
+@table @code
+@item X
+The admin command.
+@end table
@end table
The options shown as @samp{-flags} constrain or expand
@@ -10894,9 +10905,10 @@ $ cvs -d /usr/local/cvsroot init
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-@node log
-@appendixsec log---Print out log information for files
+@node log & rlog
+@appendixsec log & rlog---Print out log information for files
@cindex log (subcommand)
+@cindex rlog (subcommand)
@itemize @bullet
@item
@@ -11221,7 +11233,7 @@ verifymsg
@itemize @bullet
@item
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules@dots{}
+rdiff [options] @{-r tag1[:date1] | -D date1@} [-r tag2[:date2] | -D date2] modules@dots{}
@item
Requires: repository.
@item
@@ -11233,10 +11245,7 @@ Synonym: patch
Builds a Larry Wall format patch(1) file between two
releases, that can be fed directly into the @code{patch}
program to bring an old release up-to-date with the new
-release. (This is one of the few @sc{cvs} commands that
-operates directly from the repository, and doesn't
-require a prior checkout.) The diff output is sent to
-the standard output device.
+release. The diff output is sent to the standard output device.
You can specify (using the standard @samp{-r} and
@samp{-D} options) any combination of one or two
@@ -11245,11 +11254,11 @@ specified, the patch file reflects diffe
that revision or date and the current head revisions in
the @sc{rcs} file.
-Note that if the software release affected is contained
-in more than one directory, then it may be necessary to
-specify the @samp{-p} option to the @code{patch} command when
-patching the old sources, so that @code{patch} is able to find
-the files that are located in other directories.
+Note that if the patch created by rdiff spans multiple directories,
+then it may be necessary to specify the @samp{-p} option when feeding
+the patch back to the @code{patch} command, so that @code{patch} is able
+to update files that are located in directories other than the one
+patch is run in.
@menu
* rdiff options:: rdiff options
@@ -11316,13 +11325,6 @@ Remember that old versions
of the @code{patch} program can't handle the unidiff
format, so if you plan to post this patch to the net
you should probably not use @samp{-u}.
-
-@item -V @var{vn}
-Expand keywords according to the rules current in
-@sc{rcs} version @var{vn} (the expansion format changed with
-@sc{rcs} version 5). Note that this option is no
-longer accepted. @sc{cvs} will always expand keywords the
-way that @sc{rcs} version 5 does.
@end table
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -11756,7 +11758,7 @@ Do not execute the tag program specified
@itemize @bullet
@item
-update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files@dots{}
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] [files@dots{}]
@item
Requires: repository, working directory.
@item
@@ -12195,7 +12197,7 @@ Unlock revision @var{rev}, or latest rev
@c ------------------------------------------------------------
@item annotate [@var{options}] [@var{files}@dots{}]
Show last revision where each line was modified. See
-@ref{annotate}.
+@ref{annotate & rannotate}.
@table @code
@item -D @var{date}
@@ -12548,7 +12550,7 @@ See @ref{Kerberos authenticated}.
@c ------------------------------------------------------------
@item log [@var{options}] [@var{files}@dots{}]
-Print out history information for files. See @ref{log}.
+Print out history information for files. See @ref{log & rlog}.
@table @code
@item -b
@@ -12602,7 +12604,7 @@ See @ref{Password authentication server}
@c ------------------------------------------------------------
@item rannotate [@var{options}] [@var{modules}@dots{}]
Show last revision where each line was modified. See
-@ref{annotate}.
+@ref{annotate & rannotate}.
@table @code
@item -D @var{date}
@@ -12699,7 +12701,7 @@ behavior}.
@c ------------------------------------------------------------
@item rlog [@var{options}] [@var{files}@dots{}]
-Print out history information for modules. See @ref{log}.
+Print out history information for modules. See @ref{log & rlog}.
@table @code
@item -b
@@ -15028,7 +15030,7 @@ repository with LockDir enabled.
@cindex LogHistory, in CVSROOT/config
@item LogHistory=@var{value}
Control what is logged to the @file{CVSROOT/history} file (@pxref{history}).
-Default of @samp{TOEFWUPCGMAR} (or simply @samp{all}) will log
+Default of @samp{TOEFWUPCGMARX} (or simply @samp{all}) will log
all transactions. Any subset of the default is
legal. (For example, to only log transactions that modify the
@file{*,v} files, use @samp{LogHistory=TMAR}.) To disable history logging
