The attached patch may be freely redistributed.
This patch creates sections in cvs.1 for the add and remove commands.
I attempted to duplicate precedents of style and content, and copy/
pasted applicable segments of text to assure consistent wording, but
please feel free to alter it or make suggestions for a resubmission.
The patch also modifies one other example slightly because it messed
up vim's syntax highlighting from the point at which it occurred to the
end of the file. While this may be a vim syntax highlighter issue, the
example is readable in the current form, and does not affect vim's
highlighting. In essence, when a command is literally written:
some_command | \
some_other_command
In Bash, the prompting is as follows:
$ some_command | \
> some_other_command
The example previously used:
$ some_command | \
$$ some_other_command
This was likely a legitimate example for some other shell, but it did
have the unfortunate effect of breaking vim's syntax highlighting.
On a side note, it amused me to learn why something I did last
week didn't work. I guess there is a ten-year old bug in cvs.
The cvs add -m option does not appear to have any effect.
$ grep -A1 "BUG.*-m" cvs.texinfo
@c As noted in BUGS, -m is broken client/server (Nov
@c 96). Also see testsuite log2-* tests.
Should I replicate the @c near my new man page sections and
resubmit?
Kevin R. Bulgrien
http://kbulgrien.home.att.net
Index: cvs.texinfo
===================================================================
RCS file: /sources/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.695
diff -u -r1.695 cvs.texinfo
--- cvs.texinfo 12 Aug 2006 02:50:12 -0000 1.695
+++ cvs.texinfo 12 Aug 2006 20:55:40 -0000
@@ -9020,6 +9020,96 @@
@include getdate-cvs.texi
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[EMAIL PROTECTED] add
[EMAIL PROTECTED] add---Add files to the repository
[EMAIL PROTECTED] add (subcommand)
+
[EMAIL PROTECTED] @bullet
[EMAIL PROTECTED]
+Synopsis: add [-k rcs-kflag] [-m message] files...
[EMAIL PROTECTED]
+Requires: repository, working directory.
[EMAIL PROTECTED]
+Changes: repository, working directory.
[EMAIL PROTECTED] 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 removed but not committed. Resurrected
+files are restored into the working directory at the
+time the @code{add} command is executed.
+
[EMAIL PROTECTED]
+* add options:: add options
+* add examples:: add examples
[EMAIL PROTECTED] menu
+
[EMAIL PROTECTED] . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
[EMAIL PROTECTED] add options
[EMAIL PROTECTED] add options
+
+These standard options are supported by @code{add}
+(@pxref{Common options}, for a complete description of
+them):
+
[EMAIL PROTECTED] @code
[EMAIL PROTECTED] -k @var{kflag}
+Process keywords according to @var{kflag}. See
[EMAIL PROTECTED] substitution}.
+This option is sticky; future updates of
+this file in this working directory will use the same
[EMAIL PROTECTED] The @code{status} command can be viewed
+to see the sticky options. See @ref{Invoking CVS}, for
+more information on the @code{status} command.
+
[EMAIL PROTECTED] -m @var{message}
+Use @var{message} as the log message, instead of
+invoking an editor.
[EMAIL PROTECTED] table
+
[EMAIL PROTECTED] . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
[EMAIL PROTECTED] add examples
[EMAIL PROTECTED] add examples
+
[EMAIL PROTECTED] Adding a directory
+
[EMAIL PROTECTED]
+$ mkdir doc
+$ cvs add doc
+Directory /path/to/repository/doc added to the repository
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] Adding a file
+
[EMAIL PROTECTED]
+
+$ >TODO
+$ cvs add TODO
+cvs add: scheduling file `TODO' for addition
+cvs add: use 'cvs commit' to add this file permanently
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] Undoing a @code{remove} command
+
[EMAIL PROTECTED]
+$ 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
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node admin
@appendixsec admin---Administration
@cindex Admin (subcommand)
@@ -11493,7 +11583,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
@@ -11628,6 +11718,94 @@
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[EMAIL PROTECTED] remove
[EMAIL PROTECTED] remove---Remove files from development
[EMAIL PROTECTED] remove (subcommand)
+
[EMAIL PROTECTED] @bullet
[EMAIL PROTECTED]
+Synopsis: remove [-flR] [files...]
[EMAIL PROTECTED]
+Requires: repository, working directory.
[EMAIL PROTECTED]
+Changes: working directory.
[EMAIL PROTECTED] itemize
+
+The @code{remove} command is used to remove old files
+from active development. Only the working directory
+is updated. Changes to the repository are not made
+until the @code{commit} command is used on newly
+removed files. The user normally deletes files from
+the working directory before the @code{remove}
+command is invoked.
+
+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} before committing the
+changes @xref{add}.
+
[EMAIL PROTECTED]
+* remove options:: remove options
+* remove examples:: remove examples
[EMAIL PROTECTED] menu
+
[EMAIL PROTECTED] . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
[EMAIL PROTECTED] remove options
[EMAIL PROTECTED] remove options
+
+These standard options are supported by @code{remove}
+(@pxref{Common options}, for a complete description of
+them):
+
[EMAIL PROTECTED] @code
[EMAIL PROTECTED] -l
+Local; run only in current working directory. @xref{Recursive behavior}.
+
[EMAIL PROTECTED] -R
+Process directories recursively. @xref{Recursive behavior}.
+
[EMAIL PROTECTED] table
+
+In addition, these options are also supported:
+
[EMAIL PROTECTED] @code
[EMAIL PROTECTED] -f
+Note that this is not the standard behavior of
+the @samp{-f} option as defined in @ref{Common options}.
+
+Delete the file before removing it.
+
[EMAIL PROTECTED] table
+
[EMAIL PROTECTED] . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
[EMAIL PROTECTED] remove examples
[EMAIL PROTECTED] remove examples
+
[EMAIL PROTECTED] Removing a file
+
[EMAIL PROTECTED]
+$ 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
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED]
+$ 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
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node server & pserver
@appendixsec server & pserver---Act as a server for a client on stdin/stdout
@cindex pserver (subcommand)
_______________________________________________
Bug-cvs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/bug-cvs
