Mercurial > hgbook
comparison en/undo.tex @ 123:f954c6f6eaa1
Progress.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 26 Dec 2006 09:59:12 -0800 |
parents | 3af28630fe8c |
children | c9aad709bd3a |
comparison
equal
deleted
inserted
replaced
122:3af28630fe8c | 123:f954c6f6eaa1 |
---|---|
152 telling Mercurial (recall that in Mercurial terminology, this kind of | 152 telling Mercurial (recall that in Mercurial terminology, this kind of |
153 file is called ``missing''). | 153 file is called ``missing''). |
154 \interaction{daily.revert.missing} | 154 \interaction{daily.revert.missing} |
155 | 155 |
156 If you revert a \hgcmd{copy}, the copied-to file remains in your | 156 If you revert a \hgcmd{copy}, the copied-to file remains in your |
157 working directory afterwards, unmodified. | 157 working directory afterwards, untracked. Since a copy doesn't affect |
158 the copied-from file in any way, Mercurial doesn't do anything with | |
159 the copied-from file. | |
158 \interaction{daily.revert.copy} | 160 \interaction{daily.revert.copy} |
159 | 161 |
160 \subsubsection{A slightly special case: reverting a rename} | 162 \subsubsection{A slightly special case: reverting a rename} |
161 | 163 |
162 If you \hgcmd{rename} a file, there is one small detail that | 164 If you \hgcmd{rename} a file, there is one small detail that |
176 then revert both components of the rename, when Mercurial restores the | 178 then revert both components of the rename, when Mercurial restores the |
177 file that was removed as part of the rename, it will be unmodified. | 179 file that was removed as part of the rename, it will be unmodified. |
178 If you need the modifications in the renamed-to file to show up in the | 180 If you need the modifications in the renamed-to file to show up in the |
179 renamed-from file, don't forget to copy them over.) | 181 renamed-from file, don't forget to copy them over.) |
180 | 182 |
181 These fiddly aspects of reverting a rename arguably consitute a small | 183 These fiddly aspects of reverting a rename arguably constitute a small |
182 bug in Mercurial. | 184 bug in Mercurial. |
183 | 185 |
184 %%% Local Variables: | 186 %%% Local Variables: |
185 %%% mode: latex | 187 %%% mode: latex |
186 %%% TeX-master: "00book" | 188 %%% TeX-master: "00book" |