Commits

Bryan O'Sullivan  committed 1f69202

More text for MQ chapter.

  • Participants
  • Parent commits e9d5b4c

Comments (0)

Files changed (1)

 with the standard Mercurial distribution.)  To enable MQ, edit your
 \tildefile{.hgrc} file, and add the lines in figure~\ref{ex:mq:config}.
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \begin{codesample4}
     [extensions]
     hgext.mq =
 \hgcmd{help} to see if the \hgcmd{qinit} command is now available; see
 the example in figure~\ref{ex:mq:enabled}.
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.qinit-help.help}
   \caption{How to verify that MQ is enabled}
   \label{ex:mq:enabled}
 with many Mercurial commands, the \hgcmd{qinit} command prints nothing
 if it succeeds.
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qinit}
   \caption{Preparing a repository for use with MQ}
   \label{ex:mq:qinit}
 \end{figure}
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qnew}
   \caption{Creating a new patch}
   \label{ex:mq:qnew}
 the working directory into your patch, and updates its corresponding
 changeset to contain those changes.
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qrefresh}
   \caption{Refreshing a patch}
   \label{ex:mq:qrefresh}
 time; try an experiment; and if the experiment doesn't work out,
 \hgcmd{revert} your modifications back to the last time you refreshed.
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qrefresh2}
   \caption{Refresh a patch many times to accumulate changes}
   \label{ex:mq:qrefresh2}
 contains the changes in our prior patch as part of its context (you
 can see this more clearly in the output of \hgcmd{annotate}).
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qnew2}
   \caption{Stacking a second patch on top of the first}
   \label{ex:mq:qnew2}
   recently applied).
 \end{itemize}
 
-\begin{figure}[h]
+\begin{figure}[ht]
   \interaction{mq.tutorial.qseries}
   \caption{Understanding the patch stack with \hgcmd{qseries} and
     \hgcmd{qapplied}}
 An \emph{applied} patch has a corresponding changeset in the
 repository, and the effects of the patch and changeset are visible in
 the working directory.  You can undo the application of a patch using
-the \hgcmd{qpop} command.  MQ still \emph{knows about} a popped patch,
-but it no longer has a corresponding changeset in the repository, and
-the working directory does not contain the changes made by the patch.
+the \hgcmd{qpop} command.  MQ still \emph{knows about}, or manages, a
+popped patch, but the patch no longer has a corresponding changeset in
+the repository, and the working directory does not contain the changes
+made by the patch.  Figure~\ref{fig:mq:stack} illustrates the
+difference between applied and tracked patches.
 
-\begin{figure}[h]
-  \interaction{mq.tutorial.qpop}
-  \caption{Modifying the stack of applied patches}
-  \label{ex:mq:qpop}
+\begin{figure}[ht]
+  \centering
+  \grafix{mq-stack}
+  \caption{Applied and unapplied patches in the MQ patch stack}
+  \label{fig:mq:stack}
 \end{figure}
 
 You can reapply an unapplied, or popped, patch using the \hgcmd{qpush}
 or two patches, the output of \hgcmd{qseries} remains the same, while
 that of \hgcmd{qapplied} has changed.
 
-\begin{figure}
-  \centering
-  \grafix{mq-stack}
-  \caption{Applied and unapplied patches in the MQ patch stack}
-  \label{fig:mq:stack}
+\begin{figure}[ht]
+  \interaction{mq.tutorial.qpop}
+  \caption{Modifying the stack of applied patches}
+  \label{ex:mq:qpop}
 \end{figure}
 
 MQ does not limit you to pushing or popping one patch.  You can have