hgbook
changeset 12:1f692024d438
More text for MQ chapter.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jun 29 08:36:53 2006 -0700 (2006-06-29) |
parents | e9d5b4c3d16b |
children | 5c3966f6991b |
files | en/mq.tex |
line diff
1.1 --- a/en/mq.tex Thu Jun 29 00:32:35 2006 -0700 1.2 +++ b/en/mq.tex Thu Jun 29 08:36:53 2006 -0700 1.3 @@ -133,7 +133,7 @@ 1.4 with the standard Mercurial distribution.) To enable MQ, edit your 1.5 \tildefile{.hgrc} file, and add the lines in figure~\ref{ex:mq:config}. 1.6 1.7 -\begin{figure}[h] 1.8 +\begin{figure}[ht] 1.9 \begin{codesample4} 1.10 [extensions] 1.11 hgext.mq = 1.12 @@ -147,7 +147,7 @@ 1.13 \hgcmd{help} to see if the \hgcmd{qinit} command is now available; see 1.14 the example in figure~\ref{ex:mq:enabled}. 1.15 1.16 -\begin{figure}[h] 1.17 +\begin{figure}[ht] 1.18 \interaction{mq.qinit-help.help} 1.19 \caption{How to verify that MQ is enabled} 1.20 \label{ex:mq:enabled} 1.21 @@ -161,13 +161,13 @@ 1.22 with many Mercurial commands, the \hgcmd{qinit} command prints nothing 1.23 if it succeeds. 1.24 1.25 -\begin{figure}[h] 1.26 +\begin{figure}[ht] 1.27 \interaction{mq.tutorial.qinit} 1.28 \caption{Preparing a repository for use with MQ} 1.29 \label{ex:mq:qinit} 1.30 \end{figure} 1.31 1.32 -\begin{figure}[h] 1.33 +\begin{figure}[ht] 1.34 \interaction{mq.tutorial.qnew} 1.35 \caption{Creating a new patch} 1.36 \label{ex:mq:qnew} 1.37 @@ -207,7 +207,7 @@ 1.38 the working directory into your patch, and updates its corresponding 1.39 changeset to contain those changes. 1.40 1.41 -\begin{figure}[h] 1.42 +\begin{figure}[ht] 1.43 \interaction{mq.tutorial.qrefresh} 1.44 \caption{Refreshing a patch} 1.45 \label{ex:mq:qrefresh} 1.46 @@ -218,7 +218,7 @@ 1.47 time; try an experiment; and if the experiment doesn't work out, 1.48 \hgcmd{revert} your modifications back to the last time you refreshed. 1.49 1.50 -\begin{figure}[h] 1.51 +\begin{figure}[ht] 1.52 \interaction{mq.tutorial.qrefresh2} 1.53 \caption{Refresh a patch many times to accumulate changes} 1.54 \label{ex:mq:qrefresh2} 1.55 @@ -233,7 +233,7 @@ 1.56 contains the changes in our prior patch as part of its context (you 1.57 can see this more clearly in the output of \hgcmd{annotate}). 1.58 1.59 -\begin{figure}[h] 1.60 +\begin{figure}[ht] 1.61 \interaction{mq.tutorial.qnew2} 1.62 \caption{Stacking a second patch on top of the first} 1.63 \label{ex:mq:qnew2} 1.64 @@ -253,7 +253,7 @@ 1.65 recently applied). 1.66 \end{itemize} 1.67 1.68 -\begin{figure}[h] 1.69 +\begin{figure}[ht] 1.70 \interaction{mq.tutorial.qseries} 1.71 \caption{Understanding the patch stack with \hgcmd{qseries} and 1.72 \hgcmd{qapplied}} 1.73 @@ -269,14 +269,17 @@ 1.74 An \emph{applied} patch has a corresponding changeset in the 1.75 repository, and the effects of the patch and changeset are visible in 1.76 the working directory. You can undo the application of a patch using 1.77 -the \hgcmd{qpop} command. MQ still \emph{knows about} a popped patch, 1.78 -but it no longer has a corresponding changeset in the repository, and 1.79 -the working directory does not contain the changes made by the patch. 1.80 - 1.81 -\begin{figure}[h] 1.82 - \interaction{mq.tutorial.qpop} 1.83 - \caption{Modifying the stack of applied patches} 1.84 - \label{ex:mq:qpop} 1.85 +the \hgcmd{qpop} command. MQ still \emph{knows about}, or manages, a 1.86 +popped patch, but the patch no longer has a corresponding changeset in 1.87 +the repository, and the working directory does not contain the changes 1.88 +made by the patch. Figure~\ref{fig:mq:stack} illustrates the 1.89 +difference between applied and tracked patches. 1.90 + 1.91 +\begin{figure}[ht] 1.92 + \centering 1.93 + \grafix{mq-stack} 1.94 + \caption{Applied and unapplied patches in the MQ patch stack} 1.95 + \label{fig:mq:stack} 1.96 \end{figure} 1.97 1.98 You can reapply an unapplied, or popped, patch using the \hgcmd{qpush} 1.99 @@ -287,11 +290,10 @@ 1.100 or two patches, the output of \hgcmd{qseries} remains the same, while 1.101 that of \hgcmd{qapplied} has changed. 1.102 1.103 -\begin{figure} 1.104 - \centering 1.105 - \grafix{mq-stack} 1.106 - \caption{Applied and unapplied patches in the MQ patch stack} 1.107 - \label{fig:mq:stack} 1.108 +\begin{figure}[ht] 1.109 + \interaction{mq.tutorial.qpop} 1.110 + \caption{Modifying the stack of applied patches} 1.111 + \label{ex:mq:qpop} 1.112 \end{figure} 1.113 1.114 MQ does not limit you to pushing or popping one patch. You can have