Mercurial > hgbook
changeset 123:f954c6f6eaa1
Progress.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 26 Dec 2006 09:59:12 -0800 |
| parents | 3af28630fe8c |
| children | c9aad709bd3a |
| files | en/examples/daily.revert en/undo.tex |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/daily.revert Wed Nov 15 16:57:29 2006 -0800 +++ b/en/examples/daily.revert Tue Dec 26 09:59:12 2006 -0800 @@ -70,6 +70,5 @@ hg status #$ name: rename-orig - hg revert file hg status
--- a/en/undo.tex Wed Nov 15 16:57:29 2006 -0800 +++ b/en/undo.tex Tue Dec 26 09:59:12 2006 -0800 @@ -154,7 +154,9 @@ \interaction{daily.revert.missing} If you revert a \hgcmd{copy}, the copied-to file remains in your -working directory afterwards, unmodified. +working directory afterwards, untracked. Since a copy doesn't affect +the copied-from file in any way, Mercurial doesn't do anything with +the copied-from file. \interaction{daily.revert.copy} \subsubsection{A slightly special case: reverting a rename} @@ -178,7 +180,7 @@ If you need the modifications in the renamed-to file to show up in the renamed-from file, don't forget to copy them over.) -These fiddly aspects of reverting a rename arguably consitute a small +These fiddly aspects of reverting a rename arguably constitute a small bug in Mercurial. %%% Local Variables: