Mercurial > hgbook
changeset 412:a168daed199b
Fix typos
author | Simon Ruderich <simon@ruderich.org> |
---|---|
date | Tue, 26 Aug 2008 13:55:04 -0700 |
parents | 5561812fc5c9 |
children | 635d7c0fcac3 |
files | en/hook.tex en/intro.tex en/template.tex en/tour-basic.tex en/undo.tex |
diffstat | 5 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/en/hook.tex Tue Aug 26 20:49:37 2008 +0200 +++ b/en/hook.tex Tue Aug 26 13:55:04 2008 -0700 @@ -241,7 +241,7 @@ \end{figure} All hooks follow the pattern in example~\ref{ex:hook:init}. You add -an entry to the \rcsection{hooks} section of your \hgrc\. On the left +an entry to the \rcsection{hooks} section of your \hgrc. On the left is the name of the event to trigger on; on the right is the action to take. As you can see, you can run an arbitrary shell command in a hook. Mercurial passes extra information to the hook using
--- a/en/intro.tex Tue Aug 26 20:49:37 2008 +0200 +++ b/en/intro.tex Tue Aug 26 13:55:04 2008 -0700 @@ -385,7 +385,7 @@ every revision control operation I have benchmarked. I have measured its advantage as ranging from a factor of two to a factor of six when compared with Subversion~1.4.3's \emph{ra\_local} file store, which is -the fastest access method available). In more realistic deployments +the fastest access method available. In more realistic deployments involving a network-based store, Subversion will be at a substantially larger disadvantage. Because many Subversion commands must talk to the server and Subversion does not have useful replication facilities,
--- a/en/template.tex Tue Aug 26 20:49:37 2008 +0200 +++ b/en/template.tex Tue Aug 26 13:55:04 2008 -0700 @@ -462,7 +462,7 @@ We could have included the text of the template file directly in the style file by enclosing it in quotes and replacing the newlines with -``\texttt{\\n}'' sequences, but it would have made the style file too +``\verb!\n!'' sequences, but it would have made the style file too difficult to read. Readability is a good guide when you're trying to decide whether some text belongs in a style file, or in a template file that the style file points to. If the style file will look too
--- a/en/tour-basic.tex Tue Aug 26 20:49:37 2008 +0200 +++ b/en/tour-basic.tex Tue Aug 26 13:55:04 2008 -0700 @@ -66,9 +66,14 @@ a compatible version of Universal MacPython~\cite{web:macpython}. This is easy to do; simply follow the instructions on Lee's site. +It's also possible to install Mercurial using Fink or MacPorts, +two popular free package managers for Mac OS X. If you have Fink, +use \command{sudo apt-get install mercurial-py25}. If MacPorts, +\command{sudo port install mercurial}. + \subsection{Windows} -Lee Cantey also publishes an installer of Mercurial for Windows at +Lee Cantey publishes an installer of Mercurial for Windows at \url{http://mercurial.berkwood.com}. This package has no external dependencies; it ``just works''.
--- a/en/undo.tex Tue Aug 26 20:49:37 2008 +0200 +++ b/en/undo.tex Tue Aug 26 13:55:04 2008 -0700 @@ -194,6 +194,8 @@ So remember, to revert a \hgcmd{rename}, you must provide \emph{both} the source and destination names. +% TODO: the output doesn't look like it will be removed! + (By the way, if you rename a file, then modify the renamed-to file, then revert both components of the rename, when Mercurial restores the file that was removed as part of the rename, it will be unmodified. @@ -282,6 +284,8 @@ changeset. Finally, it merges back to the previous parent of the working directory, and commits the result of the merge. +% TODO: to me it looks like mercurial doesn't commit the second merge automatically! + \begin{figure}[htb] \centering \grafix{undo-non-tip} @@ -644,7 +648,7 @@ Even though we had~40 changesets to search through, the \hgcmd{bisect} command let us find the changeset that introduced our ``bug'' with only five tests. Because the number of tests that the \hgcmd{bisect} -command grows logarithmically with the number of changesets to +command performs grows logarithmically with the number of changesets to search, the advantage that it has over the ``brute force'' search approach increases with every changeset you add.