hgbook
changeset 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 |
files | en/examples/daily.revert en/undo.tex |
line diff
1.1 --- a/en/examples/daily.revert Wed Nov 15 16:57:29 2006 -0800 1.2 +++ b/en/examples/daily.revert Tue Dec 26 09:59:12 2006 -0800 1.3 @@ -70,6 +70,5 @@ 1.4 hg status 1.5 1.6 #$ name: rename-orig 1.7 - 1.8 hg revert file 1.9 hg status
2.1 --- a/en/undo.tex Wed Nov 15 16:57:29 2006 -0800 2.2 +++ b/en/undo.tex Tue Dec 26 09:59:12 2006 -0800 2.3 @@ -154,7 +154,9 @@ 2.4 \interaction{daily.revert.missing} 2.5 2.6 If you revert a \hgcmd{copy}, the copied-to file remains in your 2.7 -working directory afterwards, unmodified. 2.8 +working directory afterwards, untracked. Since a copy doesn't affect 2.9 +the copied-from file in any way, Mercurial doesn't do anything with 2.10 +the copied-from file. 2.11 \interaction{daily.revert.copy} 2.12 2.13 \subsubsection{A slightly special case: reverting a rename} 2.14 @@ -178,7 +180,7 @@ 2.15 If you need the modifications in the renamed-to file to show up in the 2.16 renamed-from file, don't forget to copy them over.) 2.17 2.18 -These fiddly aspects of reverting a rename arguably consitute a small 2.19 +These fiddly aspects of reverting a rename arguably constitute a small 2.20 bug in Mercurial. 2.21 2.22 %%% Local Variables: