CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: christos
Date: Mon Jun 21 02:48:01 UTC 2021
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo
Log Message:
PR/56256: Germain: cvs info doc incorrect for update -D
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.15
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14 Fri Jul 5 20:10:25 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Sun Jun 20 22:48:01 2021
@@ -11807,7 +11807,7 @@ them):
@table @code
@item -D date
Use the most recent revision no later than @var{date}.
-This option is sticky, and implies @samp{-P}.
+This option is sticky.
See @ref{Sticky tags}, for more information on sticky tags/dates.
@item -f
CVS commit: src/external/gpl2/xcvs/dist/doc
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 @@
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src Committed By: gutteridge Date: Sun Apr 28 07:13:16 UTC 2019 Modified Files: src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo Log Message: cvs.1 & cvs.texinfo: add a missing section documenting the "tag" and "rtag" commands. This is taken mostly from the upstream project's cvs.texinfo revisions 1.686 and 1.687. Additionally, I've reflected NetBSD's local changes to log "tag" as well as "rtag" in history, and to require admin privileges for destructive tagging commands. This addresses PR bin/33877. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/doc/cvs.1 cvs rdiff -u -r1.9 -r1.10 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.8 src/external/gpl2/xcvs/dist/doc/cvs.1:1.9 --- src/external/gpl2/xcvs/dist/doc/cvs.1:1.8 Sun Mar 3 21:11:54 2019 +++ src/external/gpl2/xcvs/dist/doc/cvs.1 Sun Apr 28 07:13:16 2019 @@ -2779,7 +2779,7 @@ export .IP "" 2 \fBT\fR .IP "" 4 -rtag +tag and rtag .SP One of five record types may result from an update: .SP @@ -3925,6 +3925,154 @@ Load configuration from \fIpath\fR rathe \fB/etc/cvs.conf\fR or prefixed by \fB/etc/cvs/\fR. This option is supported beginning with \fBcvs\fR release 1.12.13. .SP +.SH "tag & rtag" +.SS "Mark project snapshot for later retrieval." +.IX "tag (subcommand)" +.IX "freeze (subcommand)" +.IX "rtag (subcommand)" +.IX "rfreeze (subcommand)" +.SP +.IP "\(bu" 2 +tag [-bBcdFflR] [-r tag] [-D date] new_tag [files\&...] +.IP "\(bu" 2 +Requires: working directory, repository. +.IP "\(bu" 2 +Changes: repository. +.IP "\(bu" 2 +Synonym: ta, freeze +.SP +and +.SP +.IP "\(bu" 2 +rtag [-abBdFflnR] [-r tag | -D date] new_tag module\&... +.IP "\(bu" 2 +Requires: repository. +.IP "\(bu" 2 +Changes: repository. +.IP "\(bu" 2 +Synonym: rt, rfreeze +.SP +Use \fBtag\fR to assign symbolic tags to the revisions of files +checked out into your sandbox. The tags are applied immediately +to the repository, with the revision numbers to attach the tag +to supplied implicitly by the \fBcvs\fR records of your working files. +.SP +\fBrtag\fR works similarly, but does not need a sandbox to operate +in, requiring an explicitly supplied tag or date instead (or assuming +the tip of the trunk when one is not supplied explicitly). \fBcvs\fR +uses this preexisting tag or date to determine which revisions of +files in the repository to attach the new symbolic tag to. +.SP +The symbolic tags are meant to permanently record which +revisions of which files were used for some purpose. The \fBcheckout\fR +and \fBupdate\fR commands allow you to extract an exact +copy of a tagged release at any time in the future, +regardless of whether files have been changed, added, +or removed on the trunk or other branches since the release was tagged. +For more, see node `Branching and merging\(aq in the CVS manual. +.SP +These commands may also be used to delete a symbolic tag, +or to create a branch. See the options section below. +.SP +Note if you wish to run destructive commands such as tag deletion, you may +need to be a member of the group \fBcvsadmin\fR to do this. +.SP +If you attempt to create a tag that already exists, +CVS will complain and not overwrite that tag. Use +the \fB-F\fR option to move the tag to a new set of +revisions. +.SP +These standard options are supported by \fBtag\fR or \fBrtag\fR +(see node `Common options\(aq in the CVS manual, for a complete description of them): +.SP +.IP "" 0 +\fB-D \fIdate\fB\fR +.IP "" 2 +Tag the most recent revision no later than \fIdate\fR. This option is +not valid when deleting tags (see \fB-d\fR option, below). +.SP +.IP "" 0 +\fB-l\fR +.IP "" 2 +Local; run only in current working directory. see node `Recursive behavior\(aq in the CVS manual. +.SP +.IP "" 0 +\fB-R\fR +.IP "" 2 +Update directories recursively (default). see node `Recursive behavior\(aq in the CVS manual. +.SP +.IP "" 0 +\fB-r \fItag\fB[:\fIdate\fB]\fR +.IP "" 2 +Tag the revisions specified by \fItag\fR or, when \fIdate\fR is specified +and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it +existed on \fIdate\fR. This option is not valid when deleting tags +(see \fB-d\fR option, below). +.SP +Several tag specific options are also available. When an option is only +available with one of \fBtag\fR or \fBrtag\fR, it is noted below: +.SP +.IP "" 0 +\fB-a\fR +.IP "" 2 +Clear \fInew_tag\fR from removed files that would not otherwise be tagged +(\fBrtag\fR only). +.SP +.IP "" 0 +\fB-B\fR +.IP "" 2 +Allows \fB-d\fR or \fB-F\fR to delete or move branch tags. +.SP +\fBWARNING: Recovering the information stored by branch tags is +a very hard problem, more so than regular tags. Be absolutely sure you +understand what you are doing before using this
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: gutteridge
Date: Sun Mar 3 21:26:18 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo
Log Message:
cvs.texinfo: add minor formatting fix for Texinfo >5.0
Pull over a tiny fix from pkgsrc's devel/scmcvs patch-ab to support
generating info files with newer versions of Texinfo than what's
shipped in base presently. (Should base be updated at some point, or
for those using an external toolchain here.)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.9
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8 Sun Mar 3 21:11:54 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Sun Mar 3 21:26:18 2019
@@ -111,9 +111,9 @@ approved by the Free Software Foundation
@sp 4
@comment The title is printed in a large font.
@center @titlefont{Version Management}
-@sp
+@sp 1
@center @titlefont{with}
-@sp
+@sp 1
@center @titlefont{CVS}
@sp 2
@center for @sc{cvs} @value{VERSION}
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: gutteridge
Date: Sun Mar 3 21:11:54 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo
Log Message:
cvs.1 & cvs.texinfo: minor amendments and cvs.1 regen
Put a cross-reference to "init" back in "Creating a Repository" and
other minor formatting tweaks, and regenerate cvs.1 to reflect the
previous changes by christos@ in cvs.texinfo r. 1.7.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/dist/doc/cvs.1 \
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.7 src/external/gpl2/xcvs/dist/doc/cvs.1:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.7 Sat Mar 2 21:30:40 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1 Sun Mar 3 21:11:54 2019
@@ -3086,7 +3086,7 @@ See see node `Tracking sources\(aq in th
.IX "init (subcommand)"
.SP
.IP "\(bu" 2
-init
+Synopsis: init
.IP "\(bu" 2
Requires: working directory.
.IP "\(bu" 2
@@ -3096,10 +3096,16 @@ The \fBinit\fR command initializes a rep
\fBCVSROOT\fR subdirectory and some default control files. You must
use this command or initialize the repository in some other way before
you can use it. Specify the root of the repository with the general
-\fB-d\fR option.
+\fB-d\fR option. This will set up an empty repository in the
+\fBcvs\fR root specified in the usual way (see node `Repository\(aq in the CVS manual).
+.SP
+\fBinit\fR is careful to never overwrite any existing files in the
+repository, so no harm is done if you run \fBinit\fR on an already
+set-up repository. Note you may need to be a member of the group
+\fBcvsadmin\fR to do this.
.SP
Note \fBinit\fR will enable history logging; if you don\(aqt want that,
-remove the history file after running \fBinit\fR.
+remove the history file after running \fBinit\fR (see node `history file\(aq in the CVS manual).
.SP
.SH "init examples"
.SP
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7 Sun Mar 3 02:21:07 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Sun Mar 3 21:11:54 2019
@@ -1939,6 +1939,9 @@ possible to use @sc{cvs} to read from a
which one only has read access to; @sc{cvs} needs to be
able to create lock files (@pxref{Concurrency}).
+To create a repository, run the @code{cvs init}
+command (@pxref{init}).
+
@node Backing up
@section Backing up a repository
@cindex Repository, backing up
@@ -10868,21 +10871,20 @@ use this command or initialize the repos
you can use it. Specify the root of the repository with the general
@code{-d} option. This will set up an empty repository in the
@sc{cvs} root specified in the usual way (@pxref{Repository}).
-For example,
-@code{cvs init} is careful to never overwrite any
-existing files in the repository, so no harm is done if
-you run @code{cvs init} on an already set-up
-repository. Note you may need to be a member of the
-group @code{cvsadmin} to do this.
+@code{init} is careful to never overwrite any existing files in the
+repository, so no harm is done if you run @code{init} on an already
+set-up repository. Note you may need to be a member of the group
+@code{cvsadmin} to do this.
Note @code{init} will enable history logging; if you don't want that,
-remove the history file after running @code{init}. @xref{history file}.
+remove the history file after running @code{init} (@pxref{history file}).
@menu
* init examples: init examples
@end menu
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node init examples
@appendixsubsec init examples
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: christos
Date: Sun Mar 3 02:21:07 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo
Log Message:
Fix the build by merging duplicate "init" sections.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6 Sat Mar 2 16:30:40 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Sat Mar 2 21:21:07 2019
@@ -1939,26 +1939,6 @@ possible to use @sc{cvs} to read from a
which one only has read access to; @sc{cvs} needs to be
able to create lock files (@pxref{Concurrency}).
-@cindex init (subcommand)
-To create a repository, run the @code{cvs init}
-command. It will set up an empty repository in the
-@sc{cvs} root specified in the usual way
-(@pxref{Repository}). For example,
-
-@example
-cvs -d /usr/local/cvsroot init
-@end example
-
-@code{cvs init} is careful to never overwrite any
-existing files in the repository, so no harm is done if
-you run @code{cvs init} on an already set-up
-repository. Note you may need to be a member of the
-group @code{cvsadmin} to do this.
-
-@code{cvs init} will enable history logging; if you
-don't want that, remove the history file after running
-@code{cvs init}. @xref{history file}.
-
@node Backing up
@section Backing up a repository
@cindex Repository, backing up
@@ -10875,7 +10855,7 @@ See @ref{Tracking sources}, and @ref{Fro
@itemize @bullet
@item
-init
+Synopsis: init
@item
Requires: working directory.
@item
@@ -10886,12 +10866,23 @@ The @code{init} command initializes a re
@file{CVSROOT} subdirectory and some default control files. You must
use this command or initialize the repository in some other way before
you can use it. Specify the root of the repository with the general
-@code{-d} option.
+@code{-d} option. This will set up an empty repository in the
+@sc{cvs} root specified in the usual way (@pxref{Repository}).
+For example,
+
+@code{cvs init} is careful to never overwrite any
+existing files in the repository, so no harm is done if
+you run @code{cvs init} on an already set-up
+repository. Note you may need to be a member of the
+group @code{cvsadmin} to do this.
Note @code{init} will enable history logging; if you don't want that,
-remove the history file after running @code{init}.
+remove the history file after running @code{init}. @xref{history file}.
+
+@menu
+* init examples: init examples
+@end menu
-@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node init examples
@appendixsubsec init examples
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: gutteridge
Date: Sat Mar 2 21:30:40 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo
Log Message:
cvs.1 & cvs.texinfo: add details about "init"
Add a section about the "init" command that has been missing all this
time. Part of the basic description is resurrected from r. 1.20 of
cvs.1 (in its prior incarnation in the CVS project tree under /man
rather than /doc), contributed by Tom Lees back in 1999. The caveat
about the history file is copied from elsewhere in the current
cvs.texinfo file. Additional fragments written by me. Addresses the
PR bin/45446.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.5 -r1.6 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.6 src/external/gpl2/xcvs/dist/doc/cvs.1:1.7
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.6 Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1 Sat Mar 2 21:30:40 2019
@@ -3081,6 +3081,36 @@ see node `modules\(aq in the CVS manual.
.SP
See see node `Tracking sources\(aq in the CVS manual, and see node `From files\(aq in the CVS manual.
.SP
+.SH "init"
+.SS "Initialize a repository"
+.IX "init (subcommand)"
+.SP
+.IP "\(bu" 2
+init
+.IP "\(bu" 2
+Requires: working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBinit\fR command initializes a repository by adding the
+\fBCVSROOT\fR subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+\fB-d\fR option.
+.SP
+Note \fBinit\fR will enable history logging; if you don\(aqt want that,
+remove the history file after running \fBinit\fR.
+.SP
+.SH "init examples"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ cvs -d /usr/local/cvsroot init
+
+.PD
+.IP "" 0
+.SP
.SH "log"
.SS "Print out log information for files"
.IX "log (subcommand)"
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5 Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Sat Mar 2 21:30:40 2019
@@ -1952,7 +1952,8 @@ cvs -d /usr/local/cvsroot init
@code{cvs init} is careful to never overwrite any
existing files in the repository, so no harm is done if
you run @code{cvs init} on an already set-up
-repository.
+repository. Note you may need to be a member of the
+group @code{cvsadmin} to do this.
@code{cvs init} will enable history logging; if you
don't want that, remove the history file after running
@@ -8126,6 +8127,7 @@ reference to @sc{cvs} commands, @pxref{I
* export:: Export sources from CVS, similar to checkout
* 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
* ls & rls::List files in the repository
* rdiff:: 'patch' format diffs between releases
@@ -10867,6 +10869,37 @@ to recreate symbolic links on checkout,
See @ref{Tracking sources}, and @ref{From files}.
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+@node init
+@appendixsec init---Initialize a repository
+@cindex init (subcommand)
+
+@itemize @bullet
+@item
+init
+@item
+Requires: working directory.
+@item
+Changes: repository, working directory.
+@end itemize
+
+The @code{init} command initializes a repository by adding the
+@file{CVSROOT} subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+@code{-d} option.
+
+Note @code{init} will enable history logging; if you don't want that,
+remove the history file after running @code{init}.
+
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+@node init examples
+@appendixsubsec init examples
+
+@example
+$ cvs -d /usr/local/cvsroot init
+@end example
+
+@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node log
@appendixsec log---Print out log information for files
@cindex log (subcommand)
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: gutteridge
Date: Tue Feb 12 01:32:08 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo
Log Message:
cvs.1 & cvs.texinfo: add information about the "update" command's "-t"
flag to cvs.texinfo, so the installed man and info documentation match
here. This makes cvs.1 auto-generable from cvs.texinfo again, which I
plan to leverage with further additions later.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.4 -r1.5 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.5 src/external/gpl2/xcvs/dist/doc/cvs.1:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.5 Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1 Tue Feb 12 01:32:08 2019
@@ -3900,7 +3900,7 @@ Requires: repository, working directory.
.IP "\(bu" 2
Changes: working directory.
.SP
-After you\(aqve run checkout to create your private copy
+After you\(aqve run \fBcheckout\fR to create your private copy
of source from the common repository, other developers
will continue changing the central source. From time
to time, when it is convenient in your development
@@ -3954,19 +3954,6 @@ Local; run only in current working direc
Prune empty directories. See see node `Moving directories\(aq in the CVS manual.
.SP
.IP "" 0
-\fB-t\fR
-.IP "" 2
-Preserve source timestamps. Unlike \fBcheckout\fR where files are created
-using the original timestamp of the file in the repository, \fBupdate\fR
-updates files using the current time of the machine. This is convenient
-because updated files appear newer than any other files on the system so
-.BR make ( 1 )
-knows that are their corresponding built artifacts are out of date and
-they will get rebuilt. The \fB-t\fR flag instead preserves the timestamps
-of the original repository files, behaving exactly like \fBcheckout\fR.
-This is useful for maintaining a tree in the original checked-out state.
-.SP
-.IP "" 0
\fB-p\fR
.IP "" 2
Pipe files to the standard output.
@@ -3986,6 +3973,18 @@ existed on \fIdate\fR. This option is s
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates. Also
see see node `Common options\(aq in the CVS manual.
.SP
+.IP "" 0
+\fB-t\fR
+.IP "" 2
+Preserve source timestamps. Unlike \fBcheckout\fR, where files are created
+using the original timestamp of the file in the repository, \fBupdate\fR
+updates files using the current time of the machine. This is convenient
+because updated files appear newer than any other files on the system so
+\fBmake(1)\fR knows that their corresponding built artifacts are out of date
+and they will get rebuilt. The \fB-t\fR flag instead preserves the timestamps
+of the original repository files, behaving exactly like \fBcheckout\fR.
+This is useful for maintaining a tree in the original checked-out state.
+.SP
These special options are also available with
\fBupdate\fR.
.SP
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4 Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Tue Feb 12 01:32:08 2019
@@ -11595,14 +11595,14 @@ supported beginning with @sc{cvs} releas
@itemize @bullet
@item
-update [-ACdflPpR] [-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
Changes: working directory.
@end itemize
-After you've run checkout to create your private copy
+After you've run @code{checkout} to create your private copy
of source from the common repository, other developers
will continue changing the central source. From time
to time, when it is convenient in your development
@@ -11666,6 +11666,16 @@ and @var{tag} is a branch tag, the versi
existed on @var{date}. This option is sticky, and implies @samp{-P}.
See @ref{Sticky tags}, for more information on sticky tags/dates. Also
see @ref{Common options}.
+
+@item -t
+Preserve source timestamps. Unlike @code{checkout}, where files are created
+using the original timestamp of the file in the repository, @code{update}
+updates files using the current time of the machine. This is convenient
+because updated files appear newer than any other files on the system so
+@code{make(1)} knows that their corresponding built artifacts are out of date
+and they will get rebuilt. The @samp{-t} flag instead preserves the timestamps
+of the original repository files, behaving exactly like @code{checkout}.
+This is useful
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src Committed By: gutteridge Date: Sun Feb 10 22:36:27 UTC 2019 Modified Files: src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo Log Message: cvs.1 & cvs.texinfo: add missing sections documenting the "add" and "remove" commands. These were never present upstream on the branch NetBSD imported, but were subsequently added on other branches (against upstream's HEAD: cvs.1: r. 1.53 & cvs.texinfo: r. 1.697). XXX While cvs.texinfo is supposed to be used to auto-generate cvs.1, that isn't safe at present, because content has been added direct to cvs.1 in NetBSD's tree. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/doc/cvs.1 cvs rdiff -u -r1.3 -r1.4 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.4 src/external/gpl2/xcvs/dist/doc/cvs.1:1.5 --- src/external/gpl2/xcvs/dist/doc/cvs.1:1.4 Fri Jan 20 16:54:11 2017 +++ src/external/gpl2/xcvs/dist/doc/cvs.1 Sun Feb 10 22:36:27 2019 @@ -674,6 +674,111 @@ Available with the following commands: \ and \fBupdate\fR. .SP .SP +.SH "add" +.SS "Add files and directories to the repository" +.IX "add (subcommand)" +.SP +.IP "\(bu" 2 +Synopsis: add [-k rcs-kflag] [-m message] files... +.IP "\(bu" 2 +Requires: repository, working directory. +.IP "\(bu" 2 +Changes: repository, working directory. +.SP +The \fBadd\fR command is used to present new files +and directories for addition into the \fBcvs\fR +repository. When \fBadd\fR is used on a directory, +a new directory is created in the repository +immediately. When used on a file, only the working +directory is updated. Changes to the repository are +not made until the \fBcommit\fR command is used on +the newly added file. +.SP +The \fBadd\fR command also resurrects files that +have been previously removed. This can be done +before or after the \fBcommit\fR command is used +to finalize the removal of files. Resurrected files +are restored into the working directory at the time +the \fBadd\fR command is executed. +.SP +.SH "add options" +.SP +These standard options are supported by \fBadd\fR +(see node `Common options\(aq in the CVS manual, for a complete description of +them): +.SP +.IP "" 0 +\fB-k \fIkflag\fB\fR +.IP "" 2 +Process keywords according to \fIkflag\fR. See +see node `Keyword substitution\(aq in the CVS manual. +This option is sticky; future updates of +this file in this working directory will use the same +\fIkflag\fR. The \fBstatus\fR command can be viewed +to see the sticky options. For more information on +the \fBstatus\fR command, see node `Invoking CVS\(aq in the CVS manual. +.SP +.IP "" 0 +\fB-m \fImessage\fB\fR +.IP "" 2 +Use \fImessage\fR as the log message, instead of +invoking an editor. +.SP +.SH "add examples" +.SP +.SS "Adding a directory" +.SP +.PD 0 +.SP +.IP "" 2 +$ mkdir doc +.IP "" 2 +$ cvs add doc +.IP "" 2 +Directory /path/to/repository/doc added to the repository + +.PD +.IP "" 0 +.SP +.SS "Adding a file" +.SP +.PD 0 +.SP +.SP +.IP "" 2 +$ >TODO +.IP "" 2 +$ cvs add TODO +.IP "" 2 +cvs add: scheduling file \`TODO\(aq for addition +.IP "" 2 +cvs add: use \(aqcvs commit\(aq to add this file permanently + +.PD +.IP "" 0 +.SP +.SS "Undoing a \fBremove\fR command" +.SP +.PD 0 +.SP +.IP "" 2 +$ rm -f makefile +.IP "" 2 +$ cvs remove makefile +.IP "" 2 +cvs remove: scheduling \`makefile\(aq for removal +.IP "" 2 +cvs remove: use \(aqcvs commit\(aq to remove this file permanently +.IP "" 2 +$ cvs add makefile +.IP "" 2 +U makefile +.IP "" 2 +cvs add: makefile, version 1.2, resurrected + +.PD +.IP "" 0 +.SP .SH "admin" .SS "Administration" .IX "Admin (subcommand)" @@ -3624,6 +3729,131 @@ $ .PD .IP "" 0 .SP +.SH "remove" +.SS "Remove files from active use" +.IX "remove (subcommand)" +.SP +.IP "\(bu" 2 +Synopsis: remove [-flR] [files...] +.IP "\(bu" 2 +Requires: repository, working directory. +.IP "\(bu" 2 +Changes: working directory. +.SP +The \fBremove\fR command is used to remove unwanted +files from active use. The user normally deletes the +files from the working directory prior to invocation +of the \fBremove\fR command. Only the working +directory is updated. Changes to the repository are +not made until the \fBcommit\fR command is run. +.SP +The \fBremove\fR command does not delete files from +from the repository. \fBcvs\fR keeps all historical +data in the repository so that it is possible to +reconstruct previous states of the projects under +revision control. +.SP +To undo \fBcvs\fR \fBremove\fR or to resurrect files +that were previously removed, see node `add\(aq in the CVS manual. +.SP +.SH "remove options" +.SP +These standard options are supported by \fBremove\fR +(see node `Common options\(aq in the CVS manual for a complete description of +them): +.SP +.IP "" 0 +\fB-l\fR
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src
Committed By: abhinav
Date: Fri Jan 20 16:54:11 UTC 2017
Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo
Log Message:
Fix a spelling: s/regestring/registering
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.2 -r1.3 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.3 src/external/gpl2/xcvs/dist/doc/cvs.1:1.4
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.3 Wed Dec 21 21:26:28 2016
+++ src/external/gpl2/xcvs/dist/doc/cvs.1 Fri Jan 20 16:54:11 2017
@@ -1490,7 +1490,7 @@ cannot commit to a specific revision on
Refuse to commit files unless the user has registered a valid edit on the
file via \fBcvs edit\fR. This is most useful when \fBcommit -c\fR
and \fBedit -c\fR have been placed in all \fB.cvsrc\fR files.
-A commit can be forced anyways by either regestering an edit retroactively
+A commit can be forced anyways by either registering an edit retroactively
via \fBcvs edit\fR (no changes to the file will be lost) or using the
\fB-f\fR option to commit. Support for \fBcommit -c\fR requires both
client and a server versions 1.12.10 or greater.
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.2 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.3
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.2 Sat Sep 24 12:02:58 2011
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo Fri Jan 20 16:54:11 2017
@@ -9541,7 +9541,7 @@ cannot commit to a specific revision on
Refuse to commit files unless the user has registered a valid edit on the
file via @code{cvs edit}. This is most useful when @samp{commit -c}
and @samp{edit -c} have been placed in all @file{.cvsrc} files.
-A commit can be forced anyways by either regestering an edit retroactively
+A commit can be forced anyways by either registering an edit retroactively
via @code{cvs edit} (no changes to the file will be lost) or using the
@code{-f} option to commit. Support for @code{commit -c} requires both
client and a server versions 1.12.10 or greater.
CVS commit: src/external/gpl2/xcvs/dist/doc
Module Name:src Committed By: christos Date: Wed Dec 21 21:26:28 UTC 2016 Modified Files: src/external/gpl2/xcvs/dist/doc: cvs.1 Log Message: document -t for update To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/doc/cvs.1 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.2 src/external/gpl2/xcvs/dist/doc/cvs.1:1.3 --- src/external/gpl2/xcvs/dist/doc/cvs.1:1.2 Sat Sep 24 08:02:58 2011 +++ src/external/gpl2/xcvs/dist/doc/cvs.1 Wed Dec 21 16:26:28 2016 @@ -3664,7 +3664,7 @@ supported beginning with \fBcvs\fR relea .IX "update (subcommand)" .SP .IP "\(bu" 2 -update [-ACdflPpR] [-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 @@ -3724,6 +3724,19 @@ Local; run only in current working direc Prune empty directories. See see node `Moving directories\(aq in the CVS manual. .SP .IP "" 0 +\fB-t\fR +.IP "" 2 +Preserve source timestamps. Unlike \fBcheckout\fR where files are created +using the original timestamp of the file in the repository, \fBupdate\fR +updates files using the current time of the machine. This is convenient +because updated files appear newer than any other files on the system so +.BR make ( 1 ) +knows that are their corresponding built artifacts are out of date and +they will get rebuilt. The \fB-t\fR flag instead preserves the timestamps +of the original repository files, behaving exactly like \fBcheckout\fR. +This is useful for maintaining a tree in the original checked-out state. +.SP +.IP "" 0 \fB-p\fR .IP "" 2 Pipe files to the standard output.
