hgbook
changeset 551:f72b7e6cbe90
Snapshot.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Feb 05 00:01:16 2009 -0800 (2009-02-05) |
parents | 5cd47f721686 |
children | cf006cabe489 |
files | en/appA-cmdref.tex en/ch01-intro.tex en/ch02-tour-basic.tex en/ch03-tour-merge.tex en/ch04-concepts.tex en/ch05-daily.tex en/ch06-collab.tex en/ch07-filenames.tex en/ch08-branch.tex en/ch13-mq-collab.tex en/ch14-hgext.tex |
line diff
1.1 --- a/en/appA-cmdref.tex Thu Jan 29 22:56:27 2009 -0800 1.2 +++ b/en/appA-cmdref.tex Thu Feb 05 00:01:16 2009 -0800 1.3 @@ -123,8 +123,7 @@ 1.4 1.5 \subsection{Tips and tricks} 1.6 1.7 -\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status} 1.8 - differ?} 1.9 +\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status} differ?} 1.10 \label{cmdref:diff-vs-status} 1.11 1.12 When you run the \hgcmd{status} command, you'll see a list of files
2.1 --- a/en/ch01-intro.tex Thu Jan 29 22:56:27 2009 -0800 2.2 +++ b/en/ch01-intro.tex Thu Feb 05 00:01:16 2009 -0800 2.3 @@ -375,8 +375,7 @@ 2.4 2.5 Prior to version 1.5, Subversion had no useful support for merges. 2.6 At the time of writing, its merge tracking capability is new, and known to be 2.7 -\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated 2.8 - and buggy}. 2.9 +\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated and buggy}. 2.10 2.11 Mercurial has a substantial performance advantage over Subversion on 2.12 every revision control operation I have benchmarked. I have measured
3.1 --- a/en/ch02-tour-basic.tex Thu Jan 29 22:56:27 2009 -0800 3.2 +++ b/en/ch02-tour-basic.tex Thu Feb 05 00:01:16 2009 -0800 3.3 @@ -206,8 +206,7 @@ 3.4 \label{fig:tour-basic:history} 3.5 \end{figure} 3.6 3.7 -\subsection{Changesets, revisions, and talking to other 3.8 - people} 3.9 +\subsection{Changesets, revisions, and talking to other people} 3.10 3.11 As English is a notoriously sloppy language, and computer science has 3.12 a hallowed history of terminological confusion (why use one term when 3.13 @@ -225,8 +224,7 @@ 3.14 hexadecimal string. 3.15 \begin{itemize} 3.16 \item The revision number is \emph{only valid in that repository}, 3.17 -\item while the hex string is the \emph{permanent, unchanging 3.18 - identifier} that will always identify that exact changeset in 3.19 +\item while the hex string is the \emph{permanent, unchanging identifier} that will always identify that exact changeset in 3.20 \emph{every} copy of the repository. 3.21 \end{itemize} 3.22 This distinction is important. If you send someone an email talking
4.1 --- a/en/ch03-tour-merge.tex Thu Jan 29 22:56:27 2009 -0800 4.2 +++ b/en/ch03-tour-merge.tex Thu Feb 05 00:01:16 2009 -0800 4.3 @@ -85,8 +85,7 @@ 4.4 \begin{figure}[ht] 4.5 \centering 4.6 \grafix{tour-merge-merge} 4.7 - \caption{Working directory and repository during merge, and 4.8 - following commit} 4.9 + \caption{Working directory and repository during merge, and following commit} 4.10 \label{fig:tour-merge:merge} 4.11 \end{figure} 4.12
5.1 --- a/en/ch04-concepts.tex Thu Jan 29 22:56:27 2009 -0800 5.2 +++ b/en/ch04-concepts.tex Thu Feb 05 00:01:16 2009 -0800 5.3 @@ -39,8 +39,7 @@ 5.4 \begin{figure}[ht] 5.5 \centering 5.6 \grafix{filelog} 5.7 - \caption{Relationships between files in working directory and 5.8 - filelogs in repository} 5.9 + \caption{Relationships between files in working directory and filelogs in repository} 5.10 \label{fig:concepts:filelog} 5.11 \end{figure} 5.12 5.13 @@ -205,8 +204,7 @@ 5.14 after the corrupted section. This would not be possible with a 5.15 delta-only storage model. 5.16 5.17 -\section{Revision history, branching, 5.18 - and merging} 5.19 +\section{Revision history, branching, and merging} 5.20 5.21 Every entry in a Mercurial revlog knows the identity of its immediate 5.22 ancestor revision, usually referred to as its \emph{parent}. In fact, 5.23 @@ -265,8 +263,7 @@ 5.24 \subsection{What happens when you commit} 5.25 5.26 The dirstate stores parent information for more than just book-keeping 5.27 -purposes. Mercurial uses the parents of the dirstate as \emph{the 5.28 - parents of a new changeset} when you perform a commit. 5.29 +purposes. Mercurial uses the parents of the dirstate as \emph{the parents of a new changeset} when you perform a commit. 5.30 5.31 \begin{figure}[ht] 5.32 \centering
6.1 --- a/en/ch05-daily.tex Thu Jan 29 22:56:27 2009 -0800 6.2 +++ b/en/ch05-daily.tex Thu Feb 05 00:01:16 2009 -0800 6.3 @@ -136,8 +136,7 @@ 6.4 reappear, in unmodified form. 6.5 \interaction{daily.files.recover-missing} 6.6 6.7 -\subsection{Aside: why tell Mercurial explicitly to 6.8 - remove a file?} 6.9 +\subsection{Aside: why tell Mercurial explicitly to remove a file?} 6.10 6.11 You might wonder why Mercurial requires you to explicitly tell it that 6.12 you are deleting a file. Early during the development of Mercurial, 6.13 @@ -146,8 +145,7 @@ 6.14 \hgcmd{commit}, and stop tracking the file. In practice, this made it 6.15 too easy to accidentally remove a file without noticing. 6.16 6.17 -\subsection{Useful shorthand---adding and removing files 6.18 - in one step} 6.19 +\subsection{Useful shorthand---adding and removing files in one step} 6.20 6.21 Mercurial offers a combination command, \hgcmd{addremove}, that adds 6.22 untracked files and marks missing files as removed.
7.1 --- a/en/ch06-collab.tex Thu Jan 29 22:56:27 2009 -0800 7.2 +++ b/en/ch06-collab.tex Thu Feb 05 00:01:16 2009 -0800 7.3 @@ -1096,8 +1096,7 @@ 7.4 server should listen. The default port number used is~8000. 7.5 \end{itemize} 7.6 7.7 -\subsubsection{Choosing the right \hgrc\ file to add \rcsection{web} 7.8 - items to} 7.9 +\subsubsection{Choosing the right \hgrc\ file to add \rcsection{web} items to} 7.10 7.11 It is important to remember that a web server like Apache or 7.12 \texttt{lighttpd} will run under a user~ID that is different to yours.
8.1 --- a/en/ch07-filenames.tex Thu Jan 29 22:56:27 2009 -0800 8.2 +++ b/en/ch07-filenames.tex Thu Feb 05 00:01:16 2009 -0800 8.3 @@ -227,8 +227,7 @@ 8.4 looked up, its case is ignored. This is the standard arrangement on 8.5 Windows and MacOS. The names \filename{foo} and \filename{FoO} 8.6 identify the same file. This treatment of uppercase and lowercase 8.7 - letters as interchangeable is also referred to as \emph{case 8.8 - folding}. 8.9 + letters as interchangeable is also referred to as \emph{case folding}. 8.10 \item Case sensitive. The case of a name is significant at all times. 8.11 The names \filename{foo} and {FoO} identify different files. This 8.12 is the way Linux and Unix systems normally work.
9.1 --- a/en/ch08-branch.tex Thu Jan 29 22:56:27 2009 -0800 9.2 +++ b/en/ch08-branch.tex Thu Feb 05 00:01:16 2009 -0800 9.3 @@ -139,8 +139,7 @@ 9.4 file, so that when you create a tag, the changeset in which it's 9.5 recorded necessarily refers to an older changeset. When you run 9.6 \hgcmdargs{clone}{-r foo} to clone a repository as of tag 9.7 -\texttt{foo}, the new clone \emph{will not contain the history that 9.8 - created the tag} that you used to clone the repository. The result 9.9 +\texttt{foo}, the new clone \emph{will not contain the history that created the tag} that you used to clone the repository. The result 9.10 is that you'll get exactly the right subset of the project's history 9.11 in the new repository, but \emph{not} the tag you might have expected. 9.12
10.1 --- a/en/ch13-mq-collab.tex Thu Jan 29 22:56:27 2009 -0800 10.2 +++ b/en/ch13-mq-collab.tex Thu Feb 05 00:01:16 2009 -0800 10.3 @@ -83,8 +83,7 @@ 10.4 case, MQ contains a few added features that make the job more 10.5 pleasant. 10.6 10.7 -\section{Conditionally applying patches with 10.8 - guards} 10.9 +\section{Conditionally applying patches with guards} 10.10 10.11 Perhaps the best way to maintain sanity with so many targets is to be 10.12 able to choose specific patches to apply for a given situation. MQ
11.1 --- a/en/ch14-hgext.tex Thu Jan 29 22:56:27 2009 -0800 11.2 +++ b/en/ch14-hgext.tex Thu Feb 05 00:01:16 2009 -0800 11.3 @@ -297,8 +297,7 @@ 11.4 If you leave the right hand side of the definition empty, as above, 11.5 the \hgext{extdiff} extension uses the name of the command you defined 11.6 as the name of the external program to run. But these names don't 11.7 -have to be the same. Here, we define a command named ``\texttt{hg 11.8 - wibble}'', which runs \command{kdiff3}. 11.9 +have to be the same. Here, we define a command named ``\texttt{hg wibble}'', which runs \command{kdiff3}. 11.10 \begin{codesample2} 11.11 [extdiff] 11.12 cmd.wibble = kdiff3