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 13 Aug 2006 05:48:28 -0000 @@ -8248,6 +8248,7 @@ * Global options:: Options you give to the left of cvs_command * Common options:: Options you give to the right of cvs_command * Date input formats:: Acceptable formats for date specifications +* add:: Add files to the repository * admin:: Administration * annotate & rannotate:: What revision modified each line of a file? * checkout:: Checkout sources for editing @@ -8260,6 +8261,7 @@ * ls & rls:: List files in the repository * rdiff:: 'patch' format diffs between releases * release:: Indicate that a directory is no longer in use +* remove:: Remove files from active development * server & pserver:: Act as a server for a client on stdin/stdout * sign:: Attach new OpenPGP revision signature * tag & rtag:: Mark project snapshot for later retrieval @@ -9020,6 +9022,98 @@ @include getdate-cvs.texi @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +@node add +@appendixsec add---Add files to the repository +@cindex add (subcommand) + +@itemize @bullet +@item +Synopsis: add [-k rcs-kflag] [-m message] files... +@item +Requires: repository, working directory. +@item +Changes: repository, working directory. +@end 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. + +@menu +* add options:: add options +* add examples:: add examples +@end menu + +@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . +@node add options +@appendixsubsec add options + +These standard options are supported by @code{add} +(@pxref{Common options}, for a complete description of +them): + +@table @code +@item -k @var{kflag} +Process keywords according to @var{kflag}. See +@ref{Keyword substitution}. +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 +more information on the @code{status} command. + +@item -m @var{message} +Use @var{message} as the log message, instead of +invoking an editor. +@end table + +@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . +@node add examples +@appendixsubsec add examples + +@appendixsubsubsec Adding a directory + +@example +$ mkdir doc +$ cvs add doc +Directory /path/to/repository/doc added to the repository +@end example + +@appendixsubsubsec Adding a file + +@example + +$ >TODO +$ cvs add TODO +cvs add: scheduling file `TODO' for addition +cvs add: use 'cvs commit' to add this file permanently +@end example + +@appendixsubsubsec Undoing a @code{remove} command + +@example +$ 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 +@end example + +@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @node admin @appendixsec admin---Administration @cindex Admin (subcommand) @@ -11493,7 +11587,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 +11722,112 @@ @end example @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +@node remove +@appendixsec remove---Remove files from active use +@cindex remove (subcommand) + +@itemize @bullet +@item +Synopsis: remove [-flR] [files...] +@item +Requires: repository, working directory. +@item +Changes: working directory. +@end 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}. + +@menu +* remove options:: remove options +* remove examples:: remove examples +@end menu + +@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . +@node remove options +@appendixsubsec remove options + +These standard options are supported by @code{remove} +(@pxref{Common options}, for a complete description of +them): + +@table @code +@item -l +Local; run only in current working directory. @xref{Recursive behavior}. + +@item -R +Process directories recursively. @xref{Recursive behavior}. + +@end table + +In addition, these options are also supported: + +@table @code +@item -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. + +@end table + +@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . +@node remove examples +@appendixsubsec remove examples + +@appendixsubsubsec Removing a file + +@example +$ 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 +@end example + +@appendixsubsubsec Removing entire directories +@example +$ 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 +@end example + +@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @node server & pserver @appendixsec server & pserver---Act as a server for a client on stdin/stdout @cindex pserver (subcommand)