hgbook
changeset 313:a168daed199b
Fix typos
author | Simon Ruderich <simon@ruderich.org> |
---|---|
date | Tue Aug 26 13:55:04 2008 -0700 (2008-08-26) |
parents | 5561812fc5c9 |
children | 635d7c0fcac3 |
files | en/hook.tex en/intro.tex en/template.tex en/tour-basic.tex en/undo.tex |
line diff
1.1 --- a/en/hook.tex Tue Aug 26 20:49:37 2008 +0200 1.2 +++ b/en/hook.tex Tue Aug 26 13:55:04 2008 -0700 1.3 @@ -241,7 +241,7 @@ 1.4 \end{figure} 1.5 1.6 All hooks follow the pattern in example~\ref{ex:hook:init}. You add 1.7 -an entry to the \rcsection{hooks} section of your \hgrc\. On the left 1.8 +an entry to the \rcsection{hooks} section of your \hgrc. On the left 1.9 is the name of the event to trigger on; on the right is the action to 1.10 take. As you can see, you can run an arbitrary shell command in a 1.11 hook. Mercurial passes extra information to the hook using
2.1 --- a/en/intro.tex Tue Aug 26 20:49:37 2008 +0200 2.2 +++ b/en/intro.tex Tue Aug 26 13:55:04 2008 -0700 2.3 @@ -385,7 +385,7 @@ 2.4 every revision control operation I have benchmarked. I have measured 2.5 its advantage as ranging from a factor of two to a factor of six when 2.6 compared with Subversion~1.4.3's \emph{ra\_local} file store, which is 2.7 -the fastest access method available). In more realistic deployments 2.8 +the fastest access method available. In more realistic deployments 2.9 involving a network-based store, Subversion will be at a substantially 2.10 larger disadvantage. Because many Subversion commands must talk to 2.11 the server and Subversion does not have useful replication facilities,
3.1 --- a/en/template.tex Tue Aug 26 20:49:37 2008 +0200 3.2 +++ b/en/template.tex Tue Aug 26 13:55:04 2008 -0700 3.3 @@ -462,7 +462,7 @@ 3.4 3.5 We could have included the text of the template file directly in the 3.6 style file by enclosing it in quotes and replacing the newlines with 3.7 -``\texttt{\\n}'' sequences, but it would have made the style file too 3.8 +``\verb!\n!'' sequences, but it would have made the style file too 3.9 difficult to read. Readability is a good guide when you're trying to 3.10 decide whether some text belongs in a style file, or in a template 3.11 file that the style file points to. If the style file will look too
4.1 --- a/en/tour-basic.tex Tue Aug 26 20:49:37 2008 +0200 4.2 +++ b/en/tour-basic.tex Tue Aug 26 13:55:04 2008 -0700 4.3 @@ -66,9 +66,14 @@ 4.4 a compatible version of Universal MacPython~\cite{web:macpython}. This 4.5 is easy to do; simply follow the instructions on Lee's site. 4.6 4.7 +It's also possible to install Mercurial using Fink or MacPorts, 4.8 +two popular free package managers for Mac OS X. If you have Fink, 4.9 +use \command{sudo apt-get install mercurial-py25}. If MacPorts, 4.10 +\command{sudo port install mercurial}. 4.11 + 4.12 \subsection{Windows} 4.13 4.14 -Lee Cantey also publishes an installer of Mercurial for Windows at 4.15 +Lee Cantey publishes an installer of Mercurial for Windows at 4.16 \url{http://mercurial.berkwood.com}. This package has no external 4.17 dependencies; it ``just works''. 4.18
5.1 --- a/en/undo.tex Tue Aug 26 20:49:37 2008 +0200 5.2 +++ b/en/undo.tex Tue Aug 26 13:55:04 2008 -0700 5.3 @@ -194,6 +194,8 @@ 5.4 So remember, to revert a \hgcmd{rename}, you must provide \emph{both} 5.5 the source and destination names. 5.6 5.7 +% TODO: the output doesn't look like it will be removed! 5.8 + 5.9 (By the way, if you rename a file, then modify the renamed-to file, 5.10 then revert both components of the rename, when Mercurial restores the 5.11 file that was removed as part of the rename, it will be unmodified. 5.12 @@ -282,6 +284,8 @@ 5.13 changeset. Finally, it merges back to the previous parent of the 5.14 working directory, and commits the result of the merge. 5.15 5.16 +% TODO: to me it looks like mercurial doesn't commit the second merge automatically! 5.17 + 5.18 \begin{figure}[htb] 5.19 \centering 5.20 \grafix{undo-non-tip} 5.21 @@ -644,7 +648,7 @@ 5.22 Even though we had~40 changesets to search through, the \hgcmd{bisect} 5.23 command let us find the changeset that introduced our ``bug'' with 5.24 only five tests. Because the number of tests that the \hgcmd{bisect} 5.25 -command grows logarithmically with the number of changesets to 5.26 +command performs grows logarithmically with the number of changesets to 5.27 search, the advantage that it has over the ``brute force'' search 5.28 approach increases with every changeset you add. 5.29