[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo [cvs1-11-x-branch]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo [cvs1-11-x-branch] |
Date: |
Mon, 21 Aug 2006 21:33:09 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Derek Robert Price <dprice> 06/08/21 21:33:09
Modified files:
doc : ChangeLog cvs.1 cvs.texinfo
Log message:
* cvs.texinfo (man page nodes): Tweak grammar, especially refs.
(Original patch from Kevin R. Bulgrien <address@hidden>.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.721.2.125&r2=1.721.2.126
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.1?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.1.2.25&r2=1.1.2.26
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.545.2.68&r2=1.545.2.69
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.721.2.125
retrieving revision 1.721.2.126
diff -u -b -r1.721.2.125 -r1.721.2.126
--- ChangeLog 21 Aug 2006 20:56:30 -0000 1.721.2.125
+++ ChangeLog 21 Aug 2006 21:33:09 -0000 1.721.2.126
@@ -1,5 +1,8 @@
2006-08-21 Derek Price <address@hidden>
+ * cvs.texinfo (man page nodes): Tweak grammar, especially refs.
+ (Original patch from Kevin R. Bulgrien <address@hidden>.)
+
* mkman.pl (do_keyword): Process ref and p?xref differently.
(Original patch from Kevin R. Bulgrien <address@hidden>.)
Index: cvs.1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -b -r1.1.2.25 -r1.1.2.26
--- cvs.1 21 Aug 2006 20:56:30 -0000 1.1.2.25
+++ cvs.1 21 Aug 2006 21:33:09 -0000 1.1.2.26
@@ -281,7 +281,7 @@
.IP "" 2
Use \fIcvs_root_directory\fR as the root directory
pathname of the repository. Overrides the setting of
-the \fB$CVSROOT\fR environment variable. see node `Repository\(aq in the CVS
manual.
+the \fB$CVSROOT\fR environment variable. See `Repository\(aq in the CVS
manual.
.SP
.IX "EDITOR, overriding"
.IX "Overriding EDITOR"
@@ -551,7 +551,7 @@
\fB-k \fIkflag\fB\fR
.IP "" 2
Alter the default processing of keywords.
-see node `Keyword substitution\(aq in the CVS manual, for the meaning of
+See `Keyword substitution\(aq in the CVS manual, for the meaning of
\fIkflag\fR. Your \fIkflag\fR specification is
\fIsticky\fR when you use it to create a private copy
of a source file; that is, when you use this option
@@ -671,6 +671,111 @@
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
+`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)"
@@ -741,7 +846,7 @@
Sets the comment leader to \fIstring\fR. The comment
leader is not used by current versions of \fBcvs\fR or
\fBrcs\fR 5.7. Therefore, you can almost surely not
-worry about it. see node `Keyword substitution\(aq in the CVS manual.
+worry about it. See `Keyword substitution\(aq in the CVS manual.
.SP
.IP "" 0
\fB-e[\fIlogins\fB]\fR
@@ -772,7 +877,7 @@
\fB-k\fIsubst\fB\fR
.IP "" 2
Set the default keyword
-substitution to \fIsubst\fR. see node `Keyword
+substitution to \fIsubst\fR. See `Keyword
substitution\(aq in the CVS manual. Giving an explicit \fB-k\fR option to
\fBcvs update\fR, \fBcvs export\fR, or \fBcvs
checkout\fR overrides this default.
@@ -957,7 +1062,7 @@
.SP
Due to the way \fBcvs\fR handles branches \fIrev\fR
cannot be specified symbolically if it is a branch.
-see node `Magic branch numbers\(aq in the CVS manual, for an explanation.
+See `Magic branch numbers\(aq in the CVS manual for an explanation.
.SP
Make sure that no-one has checked out a copy of the
revision you outdate. Strange things will happen if he
@@ -1075,7 +1180,7 @@
.SH "annotate options"
.SP
These standard options are supported by \fBannotate\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -1167,7 +1272,7 @@
collection of source directories and files, or paths to
directories or files in the repository. The symbolic
names are defined in the \fBmodules\fR file.
-see node `modules\(aq in the CVS manual.
+See `modules\(aq in the CVS manual.
.SP
Depending on the modules you specify, \fBcheckout\fR may
recursively create directories and populate them with
@@ -1211,13 +1316,13 @@
forget to change your directory to the top level
directory.
.SP
-For the output produced by the \fBcheckout\fR command
-see `update output\(aq in the CVS manual.
+For the output produced by the \fBcheckout\fR command,
+see node `update output\(aq in the CVS manual.
.SP
.SH "checkout options"
.SP
These standard options are supported by \fBcheckout\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -1225,7 +1330,7 @@
.IP "" 2
Use the most recent revision no later than \fIdate\fR.
This option is sticky, and implies \fB-P\fR. See
-`Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
+`Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
.SP
.IP "" 0
\fB-f\fR
@@ -1243,7 +1348,7 @@
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. See `Invoking CVS\(aq in the CVS manual, for
+to see the sticky options. See `Invoking CVS\(aq in the CVS manual for
more information on the \fBstatus\fR command.
.SP
.IP "" 0
@@ -1287,7 +1392,7 @@
.IP "" 2
Reset any sticky tags, dates, or \fB-k\fR options.
Does not reset sticky \fB-k\fR options on modified files.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky
tags/dates.
.SP
.IP "" 0
\fB-c\fR
@@ -1350,7 +1455,7 @@
(:) to the tag:
\fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
.SP
-see node `Branching and merging\(aq in the CVS manual.
+See `Branching and merging\(aq in the CVS manual.
.SP
.IP "" 0
\fB-N\fR
@@ -1365,7 +1470,7 @@
\fB-s\fR
.IP "" 2
Like \fB-c\fR, but include the status of all modules,
-and sort it by the status string. see node `modules\(aq in the CVS manual, for
+and sort it by the status string. See `modules\(aq in the CVS manual, for
info about the \fB-s\fR option that is used inside the
modules file to set the module status.
.SP
@@ -1434,7 +1539,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 `log\(aq in the CVS manual. You can specify the
+\fBlog\fR command; see node `log\(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
@@ -1443,7 +1548,7 @@
.SH "commit options"
.SP
These standard options are supported by \fBcommit\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -1625,12 +1730,12 @@
under them will be compared.
.SP
The exit status for diff is different than for other
-\fBcvs\fR commands; for details `Exit status\(aq in the CVS manual.
+\fBcvs\fR commands; for details see node `Exit status\(aq in the CVS manual.
.SP
.SH "diff options"
.SP
These standard options are supported by \fBdiff\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -1733,7 +1838,7 @@
\fB--changed-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line group containing differing lines from
-both files in if-then-else format. see node `Line group formats\(aq in the
CVS manual.
+both files in if-then-else format. See `Line group formats\(aq in the CVS
manual.
.SP
.IP "" 0
\fB-d\fR
@@ -1855,7 +1960,7 @@
\fB--line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output all input lines in if-then-else format.
-see node `Line formats\(aq in the CVS manual.
+See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--minimal\fR
@@ -1882,25 +1987,25 @@
\fB--new-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a group of lines taken from just the second
-file in if-then-else format. see node `Line group formats\(aq in the CVS
manual.
+file in if-then-else format. See `Line group formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--new-line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line taken from just the second file in
-if-then-else format. see node `Line formats\(aq in the CVS manual.
+if-then-else format. See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--old-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a group of lines taken from just the first
-file in if-then-else format. see node `Line group formats\(aq in the CVS
manual.
+file in if-then-else format. See `Line group formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--old-line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line taken from just the first file in
-if-then-else format. see node `Line formats\(aq in the CVS manual.
+if-then-else format. See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB-p\fR
@@ -2531,7 +2636,7 @@
.IP "" 2
Create a directory called \fIdir\fR for the working
files, instead of using the module name.
-see node `checkout options\(aq in the CVS manual, for complete details on how
+See `checkout options\(aq in the CVS manual for complete details on how
\fBcvs\fR handles this flag.
.SP
.IP "" 0
@@ -2543,7 +2648,7 @@
\fB-N\fR
.IP "" 2
Only useful together with \fB-d \fIdir\fB\fR.
-see node `checkout options\(aq in the CVS manual, for complete details on how
+See `checkout options\(aq in the CVS manual for complete details on how
\fBcvs\fR handles this flag.
.SP
.SH "history"
@@ -2774,7 +2879,7 @@
vendor) into your source repository directory. You can
use this command both for initial creation of a
repository, and for wholesale updates to the module
-from the outside source. see node `Tracking sources\(aq in the CVS manual, for
+from the outside source. See `Tracking sources\(aq in the CVS manual for
a discussion on this subject.
.SP
The \fIrepository\fR argument gives a directory name
@@ -2791,14 +2896,14 @@
.SP
If \fBcvs\fR decides a file should be ignored
(see node `cvsignore\(aq in the CVS manual), it does not import it and prints
-\fBI \fR followed by the filename (see node `import output\(aq in the CVS
manual, for a
+\fBI \fR followed by the filename (see node `import output\(aq in the CVS
manual for a
complete description of the output).
.SP
If the file \fB$CVSROOT/CVSROOT/cvswrappers\fR exists,
any file whose names match the specifications in that
file will be treated as packages and the appropriate
filtering will be performed on the file/directory
-before being imported. see node `Wrappers\(aq in the CVS manual.
+before being imported. See `Wrappers\(aq in the CVS manual.
.SP
The outside source is saved in a first-level
branch, by default 1.1.1. Updates are leaves of this
@@ -2826,7 +2931,7 @@
.SH "import options"
.SP
This standard option is supported by \fBimport\fR
-(see node `Common options\(aq in the CVS manual, for a complete description):
+(see node `Common options\(aq in the CVS manual for a complete description):
.SP
.IP "" 0
\fB-m \fImessage\fB\fR
@@ -2847,7 +2952,7 @@
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 `Substitution modes\(aq in the CVS manual, for a
+the repository. See `Substitution modes\(aq in the CVS manual for a
list of valid \fB-k\fR settings.
.SP
.IP "" 0
@@ -2860,7 +2965,7 @@
.SP
\fIname\fR can be a file name pattern of the same type
that you can specify in the \fB.cvsignore\fR file.
-see node `cvsignore\(aq in the CVS manual.
+See `cvsignore\(aq in the CVS manual.
.SP
.IP "" 0
\fB-W \fIspec\fB\fR
@@ -3180,7 +3285,7 @@
.SH "rdiff options"
.SP
These standard options are supported by \fBrdiff\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -3269,7 +3374,7 @@
.IP "" 2
$ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \\
.IP "" 2
-$$ Mail -s \(aqThe patches you asked for\(aq address@hidden
+> Mail -s \(aqThe patches you asked for\(aq address@hidden
.PD
.IP "" 0
@@ -3342,9 +3447,9 @@
\fBWARNING: The \fBrelease\fB 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 \fBadd\fB
-command; see node `Adding files\(aq in the CVS manual) will be silently
deleted\(emeven
+created inside checked-out sources, and not added to
+the repository (using the \fBadd\fB command;
+see node `Adding files\(aq in the CVS manual) will be silently deleted\(emeven
if it is non-empty!\fR
.SP
.SH "release output"
@@ -3377,7 +3482,7 @@
The file has been removed from your private copy of the
sources, but has not yet been removed from the
repository, since you have not yet committed the
-removal. see node `commit\(aq in the CVS manual.
+removal. See `commit\(aq in the CVS manual.
.SP
.IP "" 0
\fBM \fIfile\fB\fR
@@ -3418,6 +3523,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
+.IP "" 2
+Local; run only in current working directory. See `Recursive behavior\(aq in
the CVS manual.
+.SP
+.IP "" 0
+\fB-R\fR
+.IP "" 2
+Process directories recursively. See `Recursive behavior\(aq in the CVS
manual.
+.SP
+.SP
+In addition, these options are also supported:
+.SP
+.IP "" 0
+\fB-f\fR
+.IP "" 2
+Note that this is not the standard behavior of
+the \fB-f\fR option as defined in `Common options\(aq in the CVS manual.
+.SP
+Delete files before removing them.
+.SP
+Entire directory hierarchies are easily removed
+using \fB-f\fR, but take note that it is not as
+easy to resurrect directory hierarchies as it is
+to remove them.
+.SP
+.SP
+.SH "remove examples"
+.SP
+.SS "Removing a file"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ cvs remove remove.me
+.IP "" 2
+cvs remove: file \`remove.me\(aq still in working directory
+.IP "" 2
+cvs remove: 1 file exists; remove it first
+.IP "" 2
+$ rm -f remove.me
+.IP "" 2
+$ cvs remove remove.me
+.IP "" 2
+cvs remove: scheduling \`remove.me\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+.SP
+.IP "" 2
+$ ls remove.it
+.IP "" 2
+remove.it
+.IP "" 2
+$ cvs remove -f remove.it
+.IP "" 2
+cvs remove: scheduling \`remove.it\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+
+.PD
+.IP "" 0
+.SP
+.SS "Removing entire directories"
+.SP
+.PD 0
+.IP "" 2
+$ tree -d a
+.IP "" 2
+a
+.IP "" 2
+|-- CVS
+.IP "" 2
+\`-- b
+.IP "" 2
+ \`-- CVS
+.SP
+.IP "" 2
+3 directories
+.IP "" 2
+$ cvs remove -f a
+.IP "" 2
+cvs remove: Removing a
+.IP "" 2
+cvs remove: Removing a/b
+.IP "" 2
+cvs remove: scheduling \`a/b/c\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+
+.PD
+.IP "" 0
+.SP
.SH "update"
.SS "Bring work tree in sync with repository"
.IX "update (subcommand)"
@@ -3441,7 +3671,7 @@
.SH "update options"
.SP
These standard options are available with \fBupdate\fR
-(see node `Common options\(aq in the CVS manual, for a complete description of
+(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@@ -3449,7 +3679,7 @@
.IP "" 2
Use the most recent revision no later than \fIdate\fR.
This option is sticky, and implies \fB-P\fR.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky
tags/dates.
.SP
.IP "" 0
\fB-f\fR
@@ -3467,13 +3697,13 @@
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. See `Invoking CVS\(aq in the CVS manual, for
+to see the sticky options. See `Invoking CVS\(aq in the CVS manual for
more information on the \fBstatus\fR command.
.SP
.IP "" 0
\fB-l\fR
.IP "" 2
-Local; run only in current working directory. see node `Recursive
behavior\(aq in the CVS manual.
+Local; run only in current working directory. See `Recursive behavior\(aq in
the CVS manual.
.SP
.IP "" 0
\fB-P\fR
@@ -3488,7 +3718,7 @@
.IP "" 0
\fB-R\fR
.IP "" 2
-Update directories recursively (default). see node `Recursive
+Update directories recursively (default). See `Recursive
behavior\(aq in the CVS manual.
.SP
.IP "" 0
@@ -3506,7 +3736,7 @@
.IP "" 2
Reset any sticky tags, dates, or \fB-k\fR options.
Does not reset sticky \fB-k\fR options on modified files.
-See `Sticky tags\(aq in the CVS manual, for more information on sticky
tags/dates.
+See `Sticky tags\(aq in the CVS manual for more information on sticky
tags/dates.
.SP
.IP "" 0
\fB-C\fR
@@ -3540,7 +3770,7 @@
working directory) during the update. You can specify
\fB-I\fR more than once on the command line to specify
several files to ignore. Use \fB-I !\fR to avoid
-ignoring any files at all. see node `cvsignore\(aq in the CVS manual, for
other
+ignoring any files at all. See `cvsignore\(aq in the CVS manual for other
ways to make \fBcvs\fR ignore some files.
.SP
.IP "" 0
@@ -3551,7 +3781,7 @@
.SP
\fIspec\fR can be a file name pattern of the same type
that you can specify in the \fB.cvswrappers\fR
-file. see node `Wrappers\(aq in the CVS manual.
+file. See `Wrappers\(aq in the CVS manual.
.SP
.IP "" 0
\fB-j\fIrevision\fB\fR
@@ -3571,7 +3801,7 @@
Note that using a single \fB-j \fItagname\fB\fR option rather than
\fB-j \fIbranchname\fB\fR to merge changes from a branch will
often not remove files which were removed on the branch.
-see node `Merging adds and removals\(aq in the CVS manual, for more.
+See `Merging adds and removals\(aq in the CVS manual for more information.
.SP
In addition, each \fB-j\fR option can contain an optional
date specification which, when used with branches, can
@@ -3580,7 +3810,7 @@
(:) to the tag:
\fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
.SP
-see node `Branching and merging\(aq in the CVS manual.
+See `Branching and merging\(aq in the CVS manual.
.SP
.SP
.SH "update output"
Index: cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.545.2.68
retrieving revision 1.545.2.69
diff -u -b -r1.545.2.68 -r1.545.2.69
--- cvs.texinfo 12 Aug 2006 03:02:36 -0000 1.545.2.68
+++ cvs.texinfo 21 Aug 2006 21:33:09 -0000 1.545.2.69
@@ -3673,7 +3673,7 @@
tag.
@noindent
address@hidden: the commands in this section are
address@hidden: The commands in this section are
dangerous; they permanently discard historical
information and it can be difficult or impossible to
recover from errors. If you are a @sc{cvs}
@@ -7607,6 +7607,7 @@
* ~/.cvsrc:: Default options with the ~/.cvsrc file
* Global options:: Options you give to the left of cvs_command
* Common options:: Options you give to the right of cvs_command
+* add:: Add files and directories to the repository
* admin:: Administration
* annotate:: What revision modified each line of a file?
* checkout:: Checkout sources for editing
@@ -7618,6 +7619,7 @@
* log:: Show log messages for files
* rdiff:: 'patch' format diffs between releases
* release:: Indicate that a directory is no longer in use
+* remove:: Remove files from active development
* update:: Bring work tree in sync with repository
@end menu
@@ -7818,7 +7820,7 @@
@item -d @var{cvs_root_directory}
Use @var{cvs_root_directory} as the root directory
pathname of the repository. Overrides the setting of
-the @code{$CVSROOT} environment variable. @xref{Repository}.
+the @code{$CVSROOT} environment variable. See @ref{Repository}.
@cindex EDITOR, overriding
@cindex Overriding EDITOR
@@ -8159,7 +8161,7 @@
@item -k @var{kflag}
Alter the default processing of keywords.
address@hidden substitution}, for the meaning of
+See @ref{Keyword substitution}, for the meaning of
@var{kflag}. Your @var{kflag} specification is
@dfn{sticky} when you use it to create a private copy
of a source file; that is, when you use this option
@@ -8289,6 +8291,98 @@
@end table
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden add
address@hidden add---Add files and directories to the repository
address@hidden add (subcommand)
+
address@hidden @bullet
address@hidden
+Synopsis: add [-k rcs-kflag] [-m message] files...
address@hidden
+Requires: repository, working directory.
address@hidden
+Changes: repository, working directory.
address@hidden itemize
+
+The @code{add} command is used to present new files
+and directories for addition into the @sc{cvs}
+repository. When @code{add} 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 @code{commit} command is used on
+the newly added file.
+
+The @code{add} command also resurrects files that
+have been previously removed. This can be done
+before or after the @code{commit} command is used
+to finalize the removal of files. Resurrected files
+are restored into the working directory at the time
+the @code{add} command is executed.
+
address@hidden
+* add options:: add options
+* add examples:: add examples
address@hidden menu
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. .
address@hidden add options
address@hidden add options
+
+These standard options are supported by @code{add}
+(@pxref{Common options}, for a complete description of
+them):
+
address@hidden @code
address@hidden -k @var{kflag}
+Process keywords according to @var{kflag}. See
address@hidden substitution}.
+This option is sticky; future updates of
+this file in this working directory will use the same
address@hidden The @code{status} command can be viewed
+to see the sticky options. For more information on
+the @code{status} command, @xref{Invoking CVS}.
+
address@hidden -m @var{message}
+Use @var{message} as the log message, instead of
+invoking an editor.
address@hidden table
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. .
address@hidden add examples
address@hidden add examples
+
address@hidden Adding a directory
+
address@hidden
+$ mkdir doc
+$ cvs add doc
+Directory /path/to/repository/doc added to the repository
address@hidden example
+
address@hidden Adding a file
+
address@hidden
+
+$ >TODO
+$ cvs add TODO
+cvs add: scheduling file `TODO' for addition
+cvs add: use 'cvs commit' to add this file permanently
address@hidden example
+
address@hidden Undoing a @code{remove} command
+
address@hidden
+$ rm -f makefile
+$ cvs remove makefile
+cvs remove: scheduling `makefile' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
+$ cvs add makefile
+U makefile
+cvs add: makefile, version 1.2, resurrected
address@hidden example
+
address@hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
@node admin
@appendixsec admin---Administration
@cindex Admin (subcommand)
@@ -8366,7 +8460,7 @@
Sets the comment leader to @var{string}. The comment
leader is not used by current versions of @sc{cvs} or
@sc{rcs} 5.7. Therefore, you can almost surely not
-worry about it. @xref{Keyword substitution}.
+worry about it. See @ref{Keyword substitution}.
@item address@hidden
Might not work together with @sc{cvs}. Erase the login
@@ -8389,7 +8483,7 @@
@item address@hidden
Set the default keyword
-substitution to @var{subst}. @xref{Keyword
+substitution to @var{subst}. See @ref{Keyword
substitution}. Giving an explicit @samp{-k} option to
@code{cvs update}, @code{cvs export}, or @code{cvs
checkout} overrides this default.
@@ -8553,7 +8647,7 @@
Due to the way @sc{cvs} handles branches @var{rev}
cannot be specified symbolically if it is a branch.
address@hidden branch numbers}, for an explanation.
+See @ref{Magic branch numbers} for an explanation.
@c FIXME: is this still true? I suspect not.
Make sure that no-one has checked out a copy of the
@@ -8676,7 +8770,7 @@
@appendixsubsec annotate options
These standard options are supported by @code{annotate}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@@ -8761,7 +8855,7 @@
collection of source directories and files, or paths to
directories or files in the repository. The symbolic
names are defined in the @samp{modules} file.
address@hidden
+See @ref{modules}.
@c Needs an example, particularly of the non-"modules"
@c case but probably of both.
@@ -8811,8 +8905,8 @@
forget to change your directory to the top level
directory.
-For the output produced by the @code{checkout} command
-see @ref{update output}.
+For the output produced by the @code{checkout} command,
address@hidden output}.
@menu
* checkout options:: checkout options
@@ -8824,14 +8918,14 @@
@appendixsubsec checkout options
These standard options are supported by @code{checkout}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@item -D @var{date}
Use the most recent revision no later than @var{date}.
This option is sticky, and implies @samp{-P}. See
address@hidden tags}, for more information on sticky tags/dates.
address@hidden tags} for more information on sticky tags/dates.
@item -f
Only useful with the @samp{-D @var{date}} or @samp{-r
@@ -8845,7 +8939,7 @@
This option is sticky; future updates of
this file in this working directory will use the same
@var{kflag}. The @code{status} command can be viewed
-to see the sticky options. See @ref{Invoking CVS}, for
+to see the sticky options. See @ref{Invoking CVS} for
more information on the @code{status} command.
@item -l
@@ -8877,7 +8971,7 @@
@item -A
Reset any sticky tags, dates, or @samp{-k} options.
Does not reset sticky @samp{-k} options on modified files.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
@item -c
Copy the module file, sorted, to the standard output,
@@ -8934,7 +9028,7 @@
(:) to the tag:
@address@hidden:@var{Date_Specifier}}.
address@hidden and merging}.
+See @ref{Branching and merging}.
@item -N
Only useful together with @samp{-d @var{dir}}. With
@@ -8945,7 +9039,7 @@
@item -s
Like @samp{-c}, but include the status of all modules,
-and sort it by the status string. @xref{modules}, for
+and sort it by the status string. See @ref{modules}, for
info about the @samp{-s} option that is used inside the
modules file to set the module status.
@end table
@@ -9012,7 +9106,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; @xref{log}. 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
@@ -9028,7 +9122,7 @@
@appendixsubsec commit options
These standard options are supported by @code{commit}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@@ -9188,7 +9282,7 @@
under them will be compared.
The exit status for diff is different than for other
address@hidden commands; for details @ref{Exit status}.
address@hidden commands; for details @xref{Exit status}.
@menu
* diff options:: diff options
@@ -9200,7 +9294,7 @@
@appendixsubsec diff options
These standard options are supported by @code{diff}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@@ -9295,7 +9389,7 @@
@item address@hidden
Use @var{format} to output a line group containing differing lines from
-both files in if-then-else format. @xref{Line group formats}.
+both files in if-then-else format. See @ref{Line group formats}.
@item -d
Change the algorithm to perhaps find a smaller set of changes. This makes
@@ -9373,7 +9467,7 @@
@item address@hidden
Use @var{format} to output all input lines in if-then-else format.
address@hidden formats}.
+See @ref{Line formats}.
@item --minimal
Change the algorithm to perhaps find a smaller set of changes. This
@@ -9390,19 +9484,19 @@
@item address@hidden
Use @var{format} to output a group of lines taken from just the second
-file in if-then-else format. @xref{Line group formats}.
+file in if-then-else format. See @ref{Line group formats}.
@item address@hidden
Use @var{format} to output a line taken from just the second file in
-if-then-else format. @xref{Line formats}.
+if-then-else format. See @ref{Line formats}.
@item address@hidden
Use @var{format} to output a group of lines taken from just the first
-file in if-then-else format. @xref{Line group formats}.
+file in if-then-else format. See @ref{Line group formats}.
@item address@hidden
Use @var{format} to output a line taken from just the first file in
-if-then-else format. @xref{Line formats}.
+if-then-else format. See @ref{Line formats}.
@item -p
Show which C function each change is in.
@@ -9870,7 +9964,7 @@
@item -d @var{dir}
Create a directory called @var{dir} for the working
files, instead of using the module name.
address@hidden options}, for complete details on how
+See @ref{checkout options} for complete details on how
@sc{cvs} handles this flag.
@item -k @var{subst}
@@ -9878,7 +9972,7 @@
@item -N
Only useful together with @samp{-d @var{dir}}.
address@hidden options}, for complete details on how
+See @ref{checkout options} for complete details on how
@sc{cvs} handles this flag.
@end table
@@ -10096,7 +10190,7 @@
vendor) into your source repository directory. You can
use this command both for initial creation of a
repository, and for wholesale updates to the module
-from the outside source. @xref{Tracking sources}, for
+from the outside source. See @ref{Tracking sources} for
a discussion on this subject.
The @var{repository} argument gives a directory name
@@ -10113,14 +10207,14 @@
If @sc{cvs} decides a file should be ignored
(@pxref{cvsignore}), it does not import it and prints
address@hidden } followed by the filename (@pxref{import output}, for a
address@hidden } followed by the filename (@pxref{import output} for a
complete description of the output).
If the file @file{$CVSROOT/CVSROOT/cvswrappers} exists,
any file whose names match the specifications in that
file will be treated as packages and the appropriate
filtering will be performed on the file/directory
-before being imported. @xref{Wrappers}.
+before being imported. See @ref{Wrappers}.
The outside source is saved in a first-level
branch, by default 1.1.1. Updates are leaves of this
@@ -10159,7 +10253,7 @@
@appendixsubsec import options
This standard option is supported by @code{import}
-(@pxref{Common options}, for a complete description):
+(@pxref{Common options} for a complete description):
@table @code
@item -m @var{message}
@@ -10177,7 +10271,7 @@
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 @ref{Substitution modes}, for a
+the repository. See @ref{Substitution modes} for a
list of valid @samp{-k} settings.
@item -I @var{name}
@@ -10188,7 +10282,7 @@
@var{name} can be a file name pattern of the same type
that you can specify in the @file{.cvsignore} file.
address@hidden
+See @ref{cvsignore}.
@c -- Is this really true?
@item -W @var{spec}
@@ -10515,7 +10609,7 @@
@appendixsubsec rdiff options
These standard options are supported by @code{rdiff}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@@ -10585,7 +10679,7 @@
@example
$ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \
-$$ Mail -s 'The patches you asked for' foo@@example.net
+> Mail -s 'The patches you asked for' foo@@example.net
@end example
Suppose you have made release 1.3, and forked a branch
@@ -10658,9 +10752,9 @@
@strong{WARNING: The @code{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 @code{add}
-command; @pxref{Adding files}) will be silently deleted---even
+created inside checked-out sources, and not added to
+the repository (using the @code{add} command;
address@hidden files}) will be silently deleted---even
if it is non-empty!}
@end table
@@ -10689,7 +10783,7 @@
The file has been removed from your private copy of the
sources, but has not yet been removed from the
repository, since you have not yet committed the
-removal. @xref{commit}.
+removal. See @ref{commit}.
@item M @var{file}
The file is modified in your working directory. There
@@ -10721,6 +10815,112 @@
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address@hidden remove
address@hidden remove---Remove files from active use
address@hidden remove (subcommand)
+
address@hidden @bullet
address@hidden
+Synopsis: remove [-flR] [files...]
address@hidden
+Requires: repository, working directory.
address@hidden
+Changes: working directory.
address@hidden itemize
+
+The @code{remove} 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 @code{remove} command. Only the working
+directory is updated. Changes to the repository are
+not made until the @code{commit} command is run.
+
+The @code{remove} command does not delete files from
+from the repository. @sc{cvs} keeps all historical
+data in the repository so that it is possible to
+reconstruct previous states of the projects under
+revision control.
+
+To undo @sc{cvs} @code{remove} or to resurrect files
+that were previously removed, @xref{add}.
+
address@hidden
+* remove options:: remove options
+* remove examples:: remove examples
address@hidden menu
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. .
address@hidden remove options
address@hidden remove options
+
+These standard options are supported by @code{remove}
+(@pxref{Common options} for a complete description of
+them):
+
address@hidden @code
address@hidden -l
+Local; run only in current working directory. See @ref{Recursive behavior}.
+
address@hidden -R
+Process directories recursively. See @ref{Recursive behavior}.
+
address@hidden table
+
+In addition, these options are also supported:
+
address@hidden @code
address@hidden -f
+Note that this is not the standard behavior of
+the @samp{-f} option as defined in @ref{Common options}.
+
+Delete files before removing them.
+
+Entire directory hierarchies are easily removed
+using @samp{-f}, but take note that it is not as
+easy to resurrect directory hierarchies as it is
+to remove them.
+
address@hidden table
+
address@hidden . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. .
address@hidden remove examples
address@hidden remove examples
+
address@hidden Removing a file
+
address@hidden
+$ cvs remove remove.me
+cvs remove: file `remove.me' still in working directory
+cvs remove: 1 file exists; remove it first
+$ rm -f remove.me
+$ cvs remove remove.me
+cvs remove: scheduling `remove.me' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
+
+$ ls remove.it
+remove.it
+$ cvs remove -f remove.it
+cvs remove: scheduling `remove.it' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
address@hidden example
+
address@hidden Removing entire directories
address@hidden
+$ tree -d a
+a
+|-- CVS
+`-- b
+ `-- CVS
+
+3 directories
+$ cvs remove -f a
+cvs remove: Removing a
+cvs remove: Removing a/b
+cvs remove: scheduling `a/b/c' for removal
+cvs remove: use 'cvs commit' to remove this file permanently
address@hidden example
+
address@hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
@node update
@appendixsec update---Bring work tree in sync with repository
@cindex update (subcommand)
@@ -10753,14 +10953,14 @@
@appendixsubsec update options
These standard options are available with @code{update}
-(@pxref{Common options}, for a complete description of
+(@pxref{Common options} for a complete description of
them):
@table @code
@item -D date
Use the most recent revision no later than @var{date}.
This option is sticky, and implies @samp{-P}.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
@item -f
Only useful with the @samp{-D @var{date}} or @samp{-r
@@ -10774,11 +10974,11 @@
This option is sticky; future updates of
this file in this working directory will use the same
@var{kflag}. The @code{status} command can be viewed
-to see the sticky options. See @ref{Invoking CVS}, for
+to see the sticky options. See @ref{Invoking CVS} for
more information on the @code{status} command.
@item -l
-Local; run only in current working directory. @xref{Recursive behavior}.
+Local; run only in current working directory. See @ref{Recursive behavior}.
@item -P
Prune empty directories. See @ref{Moving directories}.
@@ -10787,7 +10987,7 @@
Pipe files to the standard output.
@item -R
-Update directories recursively (default). @xref{Recursive
+Update directories recursively (default). See @ref{Recursive
behavior}.
@item -r rev
@@ -10804,7 +11004,7 @@
@item -A
Reset any sticky tags, dates, or @samp{-k} options.
Does not reset sticky @samp{-k} options on modified files.
-See @ref{Sticky tags}, for more information on sticky tags/dates.
+See @ref{Sticky tags} for more information on sticky tags/dates.
@item -C
Overwrite locally modified files with clean copies from
@@ -10832,7 +11032,7 @@
working directory) during the update. You can specify
@samp{-I} more than once on the command line to specify
several files to ignore. Use @samp{-I !} to avoid
-ignoring any files at all. @xref{cvsignore}, for other
+ignoring any files at all. See @ref{cvsignore} for other
ways to make @sc{cvs} ignore some files.
@item address@hidden
@@ -10841,7 +11041,7 @@
@var{spec} can be a file name pattern of the same type
that you can specify in the @file{.cvswrappers}
-file. @xref{Wrappers}.
+file. See @ref{Wrappers}.
@item address@hidden
With two @samp{-j} options, merge changes from the
@@ -10859,7 +11059,7 @@
Note that using a single @samp{-j @var{tagname}} option rather than
@samp{-j @var{branchname}} to merge changes from a branch will
often not remove files which were removed on the branch.
address@hidden adds and removals}, for more.
+See @ref{Merging adds and removals} for more information.
In addition, each @samp{-j} option can contain an optional
date specification which, when used with branches, can
@@ -10868,7 +11068,7 @@
(:) to the tag:
@address@hidden:@var{Date_Specifier}}.
address@hidden and merging}.
+See @ref{Branching and merging}.
@end table
@@ -12283,7 +12483,7 @@
mechanisms outside @sc{cvs}, to insert any necessary
changes.
address@hidden: do not use @code{COPY} with
address@hidden: Do not use @code{COPY} with
@sc{cvs} 1.9 or earlier - such versions of @sc{cvs} will
copy one version of your file over the other, wiping
out the previous contents.}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo [cvs1-11-x-branch],
Derek Robert Price <=