[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ...
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ... |
|
Date: |
Fri, 19 May 2006 22:16:47 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 06/05/19 22:16:47
Modified files:
doc : ChangeLog cvs.1 cvs.texinfo stamp-vti
version.texi
Log message:
* cvs.texinfo (log): Rename to...
(log & rlog): ...this and update all references.
(annotate): Rename to...
(annotate & rannotate): ...this and update all references. Add
index entries.
(commit): Add ci index entry.
* cvs.texinfo (tag & rtag): New node.
(Original tag node from Jpnairn in the Wiki.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.959&tr2=1.960&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.1.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?tr1=1.685&tr2=1.686&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?tr1=1.185&tr2=1.186&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?tr1=1.186&tr2=1.187&r1=text&r2=text
Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.959 ccvs/doc/ChangeLog:1.960
--- ccvs/doc/ChangeLog:1.959 Thu May 18 13:00:43 2006
+++ ccvs/doc/ChangeLog Fri May 19 22:16:47 2006
@@ -1,3 +1,15 @@
+2006-05-19 Derek Price <address@hidden>
+
+ * cvs.texinfo (log): Rename to...
+ (log & rlog): ...this and update all references.
+ (annotate): Rename to...
+ (annotate & rannotate): ...this and update all references. Add
+ index entries.
+ (commit): Add ci index entry.
+
+ * cvs.texinfo (tag & rtag): New node.
+ (Original tag node from Jpnairn in the Wiki.)
+
2006-05-18 Derek Price <address@hidden>
* cvs.texinfo (Setting up the files): Grammar correction.
Index: ccvs/doc/cvs.1
diff -u ccvs/doc/cvs.1:1.45 ccvs/doc/cvs.1:1.46
--- ccvs/doc/cvs.1:1.45 Wed May 17 18:24:09 2006
+++ ccvs/doc/cvs.1 Fri May 19 22:16:47 2006
@@ -1127,7 +1127,7 @@
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
@@ -1142,7 +1142,7 @@
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,
@@ -1221,7 +1221,7 @@
avoid those files from being executable on subsequent checkouts.
.SP
.SP
-.SH "annotate"
+.SH "annotate & rannotate"
.SS "What revision modified each line of a file?"
.IX "annotate (subcommand)"
.SP
@@ -1281,6 +1281,8 @@
The specified \fIwidth\fR must be greater than 0 and less than 80.
.SP
.SH "annotate example"
+.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
.SP
For example:
.SP
@@ -1568,6 +1570,7 @@
.SH "commit"
.SS "Check files into the repository"
.IX "commit (subcommand)"
+.IX "ci (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: commit [-fglnR] [-m \(aqlog_message\(aq | -F file] [-r revision]
@@ -1607,7 +1610,7 @@
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 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
@@ -1616,7 +1619,7 @@
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,
+the \fBlog\fR and \fBstatus\fR command; see see node `log & rlog\(aq in the
CVS manual,
see node `File status\(aq in the CVS manual.
.SP
.SH "commit options"
@@ -3138,9 +3141,10 @@
.SP
See see node `Tracking sources\(aq in the CVS manual, and see node `From
files\(aq in the CVS manual.
.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\&...]
@@ -3851,12 +3855,155 @@
.IP "" 2
Delete the signature(s) with key ID \fIkeyid\fR.
.SP
+.SH "tag & rtag"
+.SS "Mark a snapshot of workspace 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
+.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. \fBcvs\fR
+uses this preexisting tag or date to determine which revisions of
+files in the repository to attach the new 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 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
+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 option.\fR
+.SP
+.IP "" 0
+\fB-b\fR
+.IP "" 2
+The \fB-b\fR option makes the new tag a branch tag (see node `Branching and
+merging\(aq in the CVS manual), allowing concurrent, isolated development.
This is commonly used
+to create patches to a previously released software distribution.
+.SP
+.IP "" 0
+\fB-c\fR
+.IP "" 2
+Abort if any tagged files are locally modified (\fBtag\fR only).
+.SP
+.IP "" 0
+\fB-d\fR
+.IP "" 2
+Delete \fInew_tag\fR, instead of creating it.
+.SP
+\fBWARNING: Be very certain of your ground before you delete a tag; doing
+this permanently discards some historical information, which could later turn
+out to be valuable.\fR
+.SP
+.IP "" 0
+\fB-F\fR
+.IP "" 2
+When a tag already exists, move it to the new revision. When the tag
+does not exist, create it as normal. This option is new in \fBcvs\fR 1.4.
+The pre-1.4 behavior is identical to \fBcvs tag -F\fR.
+.SP
+\fBWARNING: Be very certain of your ground before you delete a tag; doing
+this permanently discards some historical information, which could later turn
+out to be valuable.\fR
+.SP
+.IP "" 0
+\fB-f\fR
+.IP "" 2
+With \fB-r \fItag\fB\fR or \fB-d \fIdate\fB\fR, force a head revision match
+if \fItag\fR and \fIdate\fR are not found (in other words, attach \fInew_tag\fR
+to the most recent trunk revision when \fItag\fR and \fIdate\fR do not
+resolve to an existing revision).
+.SP
+.IP "" 0
+\fB-n\fR
+.IP "" 2
+Do not execute the tag program specified in the \fBmodules\fR file.
+\fBrtag\fR only. See see node `modules\(aq in the CVS manual, for more.
+.SP
.SH "update"
.SS "Bring work tree in sync with repository"
.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 [-ACdflPpR] [-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: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.685 ccvs/doc/cvs.texinfo:1.686
--- ccvs/doc/cvs.texinfo:1.685 Thu May 18 13:00:44 2006
+++ ccvs/doc/cvs.texinfo Fri May 19 22:16:47 2006
@@ -5726,7 +5726,7 @@
@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
@@ -8216,19 +8216,20 @@
* Common options:: Options you give to the right of cvs_command
* Date input formats:: Acceptable formats for date specifications
* 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
* export:: Export sources from CVS, similar to checkout
* history:: Show status of files and users
* import:: Import sources into CVS, using vendor branches
-* 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
* server & pserver:: Act as a server for a client on stdin/stdout
* sign:: Attach new OpenPGP revision signature
+* tag & rtag:: Attach new OpenPGP revision signature
* update:: Bring work tree in sync with repository
* verify:: Verify OpenPGP revision signatures
* version:: Print client and server version strings
@@ -9265,7 +9266,7 @@
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
address@hidden log} (@pxref{log}), and in the
address@hidden log} (@pxref{log & rlog}), and in the
@address@hidden and @address@hidden keywords
(@pxref{Keyword substitution}). Note that @sc{cvs}
uses the @code{dead} state for its own purposes (@pxref{Attic}); to
@@ -9278,7 +9279,7 @@
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,
@@ -9354,8 +9355,8 @@
@end table
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden annotate
address@hidden annotate---What revision modified each line of a file?
address@hidden annotate & rannotate
address@hidden annotate & rannotate---What revision modified each line of a
file?
@cindex annotate (subcommand)
@itemize @bullet
@@ -9413,6 +9414,8 @@
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node annotate example
@appendixsubsec annotate example
address@hidden annotate (subcommand)
address@hidden rannotate (subcommand)
For example:
@@ -9682,6 +9685,7 @@
@node commit
@appendixsec commit---Check files into the repository
@cindex commit (subcommand)
address@hidden ci (subcommand)
@itemize @bullet
@item
@@ -9723,7 +9727,7 @@
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
address@hidden command; see @ref{log}. You can specify the
address@hidden command; see @ref{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
@@ -9732,7 +9736,7 @@
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},
+the @code{log} and @code{status} command; see @ref{log & rlog},
@ref{File status}.
@menu
@@ -11003,9 +11007,10 @@
See @ref{Tracking sources}, and @ref{From files}.
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden log
address@hidden log---Print out log information for files
address@hidden log & rlog
address@hidden log & rlog---Print out log information for files
@cindex log (subcommand)
address@hidden rlog (subcommand)
@itemize @bullet
@item
@@ -11651,13 +11656,141 @@
@end table
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden tag & rtag
address@hidden tag & rtag---Mark a snapshot of workspace for later retrieval.
address@hidden tag (subcommand)
address@hidden freeze (subcommand)
address@hidden rtag (subcommand)
address@hidden rfreeze (subcommand)
+
address@hidden @bullet
address@hidden
+tag [-bBcdFflR] [-r tag] [-D date] new_tag address@hidden
address@hidden
+Requires: working directory, repository.
address@hidden
+Changes: repository.
address@hidden
+Synonym: ta, freeze
address@hidden itemize
+
address@hidden @bullet
address@hidden
+rtag [-abBdFflnR] (-r tag | -D date) new_tag address@hidden
address@hidden
+Requires: repository.
address@hidden
+Changes: repository.
address@hidden
+Synonym: rt, rfreeze
address@hidden itemize
+
+Use @code{tag} 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 @sc{cvs} records of your working files.
+
address@hidden works similarly, but does not need a sandbox to operate
+in, requiring an explicitly supplied tag or date instead. @sc{cvs}
+uses this preexisting tag or date to determine which revisions of
+files in the repository to attach the new tag to.
+
+The symbolic tags are meant to permanently record which
+revisions of which files were used for some purpose. The @code{checkout}
+and @code{update} commands allow you to extract an exact
+copy of a tagged release at any time in the future,
+regardless of whether files have been changed, added,
+or removed on the trunk or other branches since the release was tagged.
+For more, see @xref{Branching and merging}.
+
+These commands may also be used to delete a symbolic tag,
+or to create a branch. See the options section below.
+
+If you attempt to create a tag that already exists,
+CVS will complain and not overwrite that tag. Use
+the @samp{-F} option to move the tag to a new set of
+revisions.
+
+These standard options are supported by @code{tag} or @code{rtag}
+(@pxref{Common options}, for a complete description of them):
+
address@hidden @code
address@hidden -D @var{date}
+Tag the most recent revision no later than @var{date}. This option is
+not valid when deleting tags (see @samp{-d} option, below).
+
address@hidden -l
+Local; run only in current working directory. @xref{Recursive behavior}.
+
address@hidden -R
+Update directories recursively (default). @xref{Recursive
+behavior}.
+
address@hidden -r @var{tag}[:@var{date}]
+Tag the revisions specified by @var{tag} or, when @var{date} is specified
+and @var{tag} is a branch tag, the version from the branch @var{tag} as it
+existed on @var{date}. This option is not valid when deleting tags
+(see @samp{-d} option, below).
address@hidden table
+
+Several tag specific options are also available. When an option is only
+available with one of @code{tag} or @code{rtag}, it is noted below:
+
address@hidden @code
address@hidden -a
+Clear @var{new_tag} from removed files that would not otherwise be tagged
+(@code{rtag} only).
+
address@hidden -B
+Allows @code{-d} or @code{-F} to delete or move branch tags.
+
address@hidden: 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 option.}
+
address@hidden -b
+The @code{-b} option makes the new tag a branch tag (@pxref{Branching and
+merging}), allowing concurrent, isolated development. This is commonly used
+to create patches to a previously released software distribution.
+
address@hidden -c
+Abort if any tagged files are locally modified (@code{tag} only).
+
address@hidden -d
+Delete @var{new_tag}, instead of creating it.
+
address@hidden: Be very certain of your ground before you delete a tag; doing
+this permanently discards some historical information, which could later turn
+out to be valuable.}
+
address@hidden -F
+When a tag already exists, move it to the new revision. When the tag
+does not exist, create it as normal. This option is new in @sc{cvs} 1.4.
+The pre-1.4 behavior is identical to @samp{cvs tag -F}.
+
address@hidden: Be very certain of your ground before you delete a tag; doing
+this permanently discards some historical information, which could later turn
+out to be valuable.}
+
address@hidden -f
+With @code{-r @var{tag}} or @code{-d @var{date}}, force a head revision match
+if @var{tag} and @var{date} are not found (in other words, attach @var{new_tag}
+to the most recent trunk revision when @var{tag} and @var{date} do not
+resolve to an existing revision).
+
address@hidden -n
+Do not execute the tag program specified in the @file{modules} file.
address@hidden only. See @xref{modules}, for more.
address@hidden table
+
address@hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
@node update
@appendixsec update---Bring work tree in sync with repository
@cindex update (subcommand)
@itemize @bullet
@item
-update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D
date] [-W spec] address@hidden
+update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D
date] [-W spec] address@hidden
@item
Requires: repository, working directory.
@item
@@ -12132,7 +12265,7 @@
@c ------------------------------------------------------------
@item annotate address@hidden address@hidden@dots{}]
Show last revision where each line was modified. See
address@hidden
address@hidden & rannotate}.
@table @code
@item -D @var{date}
@@ -12489,7 +12622,7 @@
@c ------------------------------------------------------------
@item log address@hidden address@hidden@dots{}]
-Print out history information for files. See @ref{log}.
+Print out history information for files. See @ref{log & rlog}.
@table @code
@item -b
@@ -12543,7 +12676,7 @@
@c ------------------------------------------------------------
@item rannotate address@hidden address@hidden@dots{}]
Show last revision where each line was modified. See
address@hidden
address@hidden & rannotate}.
@table @code
@item -D @var{date}
@@ -12644,7 +12777,7 @@
@c ------------------------------------------------------------
@item rlog address@hidden address@hidden@dots{}]
-Print out history information for modules. See @ref{log}.
+Print out history information for modules. See @ref{log & rlog}.
@table @code
@item -b
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.185 ccvs/doc/stamp-vti:1.186
--- ccvs/doc/stamp-vti:1.185 Wed May 17 18:24:09 2006
+++ ccvs/doc/stamp-vti Fri May 19 22:16:47 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 17 May 2006
address@hidden UPDATED 19 May 2006
@set UPDATED-MONTH May 2006
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.186 ccvs/doc/version.texi:1.187
--- ccvs/doc/version.texi:1.186 Wed May 17 18:24:09 2006
+++ ccvs/doc/version.texi Fri May 19 22:16:47 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 17 May 2006
address@hidden UPDATED 19 May 2006
@set UPDATED-MONTH May 2006
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1