hgbook
diff en/undo.tex @ 458:626c16b87174
corrected a typo
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Sun Dec 21 12:03:26 2008 -0500 (2008-12-21) |
parents | 7a6bd93174bd |
children | f79542a53cb2 91adcea08b33 |
line diff
1.1 --- a/en/undo.tex Mon Dec 31 20:06:58 2007 -0800 1.2 +++ b/en/undo.tex Sun Dec 21 12:03:26 2008 -0500 1.3 @@ -194,6 +194,8 @@ 1.4 So remember, to revert a \hgcmd{rename}, you must provide \emph{both} 1.5 the source and destination names. 1.6 1.7 +% TODO: the output doesn't look like it will be removed! 1.8 + 1.9 (By the way, if you rename a file, then modify the renamed-to file, 1.10 then revert both components of the rename, when Mercurial restores the 1.11 file that was removed as part of the rename, it will be unmodified. 1.12 @@ -282,6 +284,8 @@ 1.13 changeset. Finally, it merges back to the previous parent of the 1.14 working directory, and commits the result of the merge. 1.15 1.16 +% TODO: to me it looks like mercurial doesn't commit the second merge automatically! 1.17 + 1.18 \begin{figure}[htb] 1.19 \centering 1.20 \grafix{undo-non-tip} 1.21 @@ -644,7 +648,7 @@ 1.22 Even though we had~40 changesets to search through, the \hgcmd{bisect} 1.23 command let us find the changeset that introduced our ``bug'' with 1.24 only five tests. Because the number of tests that the \hgcmd{bisect} 1.25 -command grows logarithmically with the number of changesets to 1.26 +command performs grows logarithmically with the number of changesets to 1.27 search, the advantage that it has over the ``brute force'' search 1.28 approach increases with every changeset you add. 1.29