Mercurial > hgbook

--- a/en/appA-cmdref.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/appA-cmdref.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -123,8 +123,7 @@

 \subsection{Tips and tricks}

-\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status}
-  differ?}
+\subsubsection{Why do the results of \hgcmd{diff} and \hgcmd{status} differ?}
 \label{cmdref:diff-vs-status}

 When you run the \hgcmd{status} command, you'll see a list of files
--- a/en/ch01-intro.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch01-intro.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -375,8 +375,7 @@

 Prior to version 1.5, Subversion had no useful support for merges.
 At the time of writing, its merge tracking capability is new, and known to be
-\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated
-  and buggy}.
+\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated and buggy}.

 Mercurial has a substantial performance advantage over Subversion on
 every revision control operation I have benchmarked.  I have measured
--- a/en/ch02-tour-basic.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch02-tour-basic.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -206,8 +206,7 @@
   \label{fig:tour-basic:history}
 \end{figure}

-\subsection{Changesets, revisions, and talking to other
-  people}
+\subsection{Changesets, revisions, and talking to other people}

 As English is a notoriously sloppy language, and computer science has
 a hallowed history of terminological confusion (why use one term when
@@ -225,8 +224,7 @@
 hexadecimal string.
 \begin{itemize}
 \item The revision number is \emph{only valid in that repository},
-\item while the hex string is the \emph{permanent, unchanging
-    identifier} that will always identify that exact changeset in
+\item while the hex string is the \emph{permanent, unchanging identifier} that will always identify that exact changeset in
   \emph{every} copy of the repository.
 \end{itemize}
 This distinction is important.  If you send someone an email talking
--- a/en/ch03-tour-merge.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch03-tour-merge.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -85,8 +85,7 @@
 \begin{figure}[ht]
   \centering
   \grafix{tour-merge-merge}
-  \caption{Working directory and repository during merge, and
-    following commit}
+  \caption{Working directory and repository during merge, and following commit}
   \label{fig:tour-merge:merge}
 \end{figure}
--- a/en/ch04-concepts.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch04-concepts.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -39,8 +39,7 @@
 \begin{figure}[ht]
   \centering
   \grafix{filelog}
-  \caption{Relationships between files in working directory and
-    filelogs in repository}
+  \caption{Relationships between files in working directory and filelogs in repository}
   \label{fig:concepts:filelog}
 \end{figure}

@@ -205,8 +204,7 @@
 after the corrupted section.  This would not be possible with a
 delta-only storage model.

-\section{Revision history, branching,
-  and merging}
+\section{Revision history, branching, and merging}

 Every entry in a Mercurial revlog knows the identity of its immediate
 ancestor revision, usually referred to as its \emph{parent}.  In fact,
@@ -265,8 +263,7 @@
 \subsection{What happens when you commit}

 The dirstate stores parent information for more than just book-keeping
-purposes.  Mercurial uses the parents of the dirstate as \emph{the
-  parents of a new changeset} when you perform a commit.
+purposes.  Mercurial uses the parents of the dirstate as \emph{the parents of a new changeset} when you perform a commit.

 \begin{figure}[ht]
   \centering
--- a/en/ch05-daily.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch05-daily.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -136,8 +136,7 @@
 reappear, in unmodified form.
 \interaction{daily.files.recover-missing}

-\subsection{Aside: why tell Mercurial explicitly to
-  remove a file?}
+\subsection{Aside: why tell Mercurial explicitly to remove a file?}

 You might wonder why Mercurial requires you to explicitly tell it that
 you are deleting a file.  Early during the development of Mercurial,
@@ -146,8 +145,7 @@
 \hgcmd{commit}, and stop tracking the file.  In practice, this made it
 too easy to accidentally remove a file without noticing.

-\subsection{Useful shorthand---adding and removing files
-  in one step}
+\subsection{Useful shorthand---adding and removing files in one step}

 Mercurial offers a combination command, \hgcmd{addremove}, that adds
 untracked files and marks missing files as removed.
--- a/en/ch06-collab.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch06-collab.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -1096,8 +1096,7 @@
   server should listen.  The default port number used is~8000.
 \end{itemize}

-\subsubsection{Choosing the right \hgrc\ file to add \rcsection{web}
-  items to}
+\subsubsection{Choosing the right \hgrc\ file to add \rcsection{web} items to}

 It is important to remember that a web server like Apache or
 \texttt{lighttpd} will run under a user~ID that is different to yours.
--- a/en/ch07-filenames.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch07-filenames.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -227,8 +227,7 @@
   looked up, its case is ignored.  This is the standard arrangement on
   Windows and MacOS.  The names \filename{foo} and \filename{FoO}
   identify the same file.  This treatment of uppercase and lowercase
-  letters as interchangeable is also referred to as \emph{case
-    folding}.
+  letters as interchangeable is also referred to as \emph{case folding}.
 \item Case sensitive.  The case of a name is significant at all times.
   The names \filename{foo} and {FoO} identify different files.  This
   is the way Linux and Unix systems normally work.
--- a/en/ch08-branch.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch08-branch.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -139,8 +139,7 @@
 file, so that when you create a tag, the changeset in which it's
 recorded necessarily refers to an older changeset.  When you run
 \hgcmdargs{clone}{-r foo} to clone a repository as of tag
-\texttt{foo}, the new clone \emph{will not contain the history that
-  created the tag} that you used to clone the repository.  The result
+\texttt{foo}, the new clone \emph{will not contain the history that created the tag} that you used to clone the repository.  The result
 is that you'll get exactly the right subset of the project's history
 in the new repository, but \emph{not} the tag you might have expected.
--- a/en/ch13-mq-collab.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch13-mq-collab.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -83,8 +83,7 @@
 case, MQ contains a few added features that make the job more
 pleasant.

-\section{Conditionally applying patches with
-  guards}
+\section{Conditionally applying patches with guards}

 Perhaps the best way to maintain sanity with so many targets is to be
 able to choose specific patches to apply for a given situation.  MQ
--- a/en/ch14-hgext.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch14-hgext.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -297,8 +297,7 @@
 If you leave the right hand side of the definition empty, as above,
 the \hgext{extdiff} extension uses the name of the command you defined
 as the name of the external program to run.  But these names don't
-have to be the same.  Here, we define a command named ``\texttt{hg
-  wibble}'', which runs \command{kdiff3}.
+have to be the same.  Here, we define a command named ``\texttt{hg wibble}'', which runs \command{kdiff3}.
 \begin{codesample2}
   [extdiff]
   cmd.wibble = kdiff3