hgbook

diff en/undo.tex @ 123:f954c6f6eaa1

Progress.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Dec 26 09:59:12 2006 -0800 (2006-12-26)
parents 3af28630fe8c
children c9aad709bd3a
line diff
     1.1 --- a/en/undo.tex	Wed Nov 15 16:57:29 2006 -0800
     1.2 +++ b/en/undo.tex	Tue Dec 26 09:59:12 2006 -0800
     1.3 @@ -154,7 +154,9 @@
     1.4  \interaction{daily.revert.missing}
     1.5  
     1.6  If you revert a \hgcmd{copy}, the copied-to file remains in your
     1.7 -working directory afterwards, unmodified.
     1.8 +working directory afterwards, untracked.  Since a copy doesn't affect
     1.9 +the copied-from file in any way, Mercurial doesn't do anything with
    1.10 +the copied-from file.
    1.11  \interaction{daily.revert.copy}
    1.12  
    1.13  \subsubsection{A slightly special case: reverting a rename}
    1.14 @@ -178,7 +180,7 @@
    1.15  If you need the modifications in the renamed-to file to show up in the
    1.16  renamed-from file, don't forget to copy them over.)
    1.17  
    1.18 -These fiddly aspects of reverting a rename arguably consitute a small
    1.19 +These fiddly aspects of reverting a rename arguably constitute a small
    1.20  bug in Mercurial.
    1.21  
    1.22  %%% Local Variables: