Re: cvs tag: some slightly counterintuitive behaviour

[Andy Jones]

As promised, a diff to the manual.

This is a context (-c) diff on the 1.11.14 version of the file.  Please let me 
know if that's not okay.



*** cvs.texinfo Wed Feb  4 19:05:46 2004
--- /home/apj/cvs.texinfo       Tue Mar 30 11:02:33 2004
***************
*** 3570,3576 ****
  One potentially surprising aspect of the fact that
  @code{cvs tag} operates on the repository is that you
  are tagging the checked-in revisions, which may differ
! from locally modified files in your working directory.
  If you want to avoid doing this by mistake, specify the
  @samp{-c} option to @code{cvs tag}.  If there are any
  locally modified files, @sc{cvs} will abort with an
--- 3570,3579 ----
  One potentially surprising aspect of the fact that
  @code{cvs tag} operates on the repository is that you
  are tagging the checked-in revisions, which may differ
! from locally modified or locally deleted files in your 
! working directory.  The local changes will be ignored 
! and the checked-in revisions of these files will be 
! tagged instead.
  If you want to avoid doing this by mistake, specify the
  @samp{-c} option to @code{cvs tag}.  If there are any
  locally modified files, @sc{cvs} will abort with an
***************
*** 3582,3587 ****
--- 3585,3593 ----
  cvs [tag aborted]: correct the above errors first!
  @end example
  
+ This will work for locally modified files, but not 
+ for locally deleted ones.
+ 
  @node Tagging by date/tag
  @section Specifying what to tag by date or revision
  @cindex rtag (subcommand)
***************
*** 11624,11629 ****
--- 11630,11636 ----
  @c ------------------------------------------------------------
  @item tag address@hidden @var{tag} address@hidden@dots{}]
  Add a symbolic tag to checked out version of files.
+ Uncommitted modifications to the current working directory are ignored.
  See @ref{Revisions} and @ref{Branching and merging}.
  
  @table @code