changeset 332:9ad5d69c4a37

more mq.tex

--- a/ja/mq.tex	Sun Mar 30 14:51:01 2008 +0900
+++ b/ja/mq.tex	Sun Mar 30 16:54:49 2008 +0900
@@ -513,75 +513,109 @@
 %\subsection{Refreshing a patch}
 \subsection{$B%Q%C%A$N:F@8(B}
 
-When you reach a point where you want to save your work, use the
-\hgxcmd{mq}{qrefresh} command (figure~\ref{ex:mq:qnew}) to update the patch
-you are working on.  This command folds the changes you have made in
-the working directory into your patch, and updates its corresponding
-changeset to contain those changes.
+%When you reach a point where you want to save your work, use the
+%\hgxcmd{mq}{qrefresh} command (figure~\ref{ex:mq:qnew}) to update the patch
+%you are working on.  This command folds the changes you have made in
+%the working directory into your patch, and updates its corresponding
+%changeset to contain those changes.
 
-
-
+$B:n6HFbMF$r%;!<%V$9$k%]%$%s%H$K:9$7$+$+$C$?$i!$(B\hgxcmd{mq}{qrefresh}$B%3%^(B
+$B%s%I$r;H$C$F!J?^(B~\ref{ex:mq:qnew}$B!K:n6HCf$N%Q%C%A$r99?7$9$k!%$3$N%3%^%s(B
+$B%I$O%o!<%-%s%0%G%#%l%/%H%j$N:9J,$r%Q%C%A$K<h$j9~$_!$%A%'%s%8%;%C%H$,JQ99(B
+$B$r4^$`$h$&$K99?7$9$k!%(B
 
 \begin{figure}[ht]
   \interaction{mq.tutorial.qrefresh}
-  \caption{Refreshing a patch}
+%  \caption{Refreshing a patch}
+  \caption{$B%Q%C%A$N%j%U%l%C%7%e(B}
   \label{ex:mq:qrefresh}
 \end{figure}
 
-You can run \hgxcmd{mq}{qrefresh} as often as you like, so it's a good way
-to ``checkpoint'' your work.  Refresh your patch at an opportune
-time; try an experiment; and if the experiment doesn't work out,
-\hgcmd{revert} your modifications back to the last time you refreshed.
+%You can run \hgxcmd{mq}{qrefresh} as often as you like, so it's a good way
+%to ``checkpoint'' your work.  Refresh your patch at an opportune
+%time; try an experiment; and if the experiment doesn't work out,
+%\hgcmd{revert} your modifications back to the last time you refreshed.
+
+\hgxcmd{mq}{qrefresh}$B$O$$$D$G$b9%$-$J;~$K<B9T$G$-!$:n6H$N>uBVJ]B8$r$9$k(B
+$B$N$K$b;H$($k!%%Q%C%A$N%j%U%l%C%7%e$OET9g$N$h$$;~$K9T$($P$h$$!%<B83E*$J%3!<(B
+$B%I$rF0$+$9>l9g!$;vA0$K%j%U%l%C%7%e$r$7$F$*$1$P!$<B83$N7k2L%3!<%I$,F0$+$J(B
+$B$/$F$b!$(B\hgcmd{revert}$B$9$l$P!$JQ99$O85$KLa$k!%(B
 
 \begin{figure}[ht]
   \interaction{mq.tutorial.qrefresh2}
-  \caption{Refresh a patch many times to accumulate changes}
+%  \caption{Refresh a patch many times to accumulate changes}
+  \caption{$B%Q%C%A$N%j%U%l%C%7%e$GJQ99$rC_@Q$9$k(B}
   \label{ex:mq:qrefresh2}
 \end{figure}
 
 %\subsection{Stacking and tracking patches}
-\subsection{$B%Q%C%A$N=8@Q$HDI@W(B}
+\subsection{$B%Q%C%A$N%9%?%C%/$HDI@W(B}
 
-Once you have finished working on a patch, or need to work on another,
-you can use the \hgxcmd{mq}{qnew} command again to create a new patch.
-Mercurial will apply this patch on top of your existing patch.  See
-figure~\ref{ex:mq:qnew2} for an example.  Notice that the patch
-contains the changes in our prior patch as part of its context (you
-can see this more clearly in the output of \hgcmd{annotate}).
+%Once you have finished working on a patch, or need to work on another,
+%you can use the \hgxcmd{mq}{qnew} command again to create a new patch.
+%Mercurial will apply this patch on top of your existing patch.  See
+%figure~\ref{ex:mq:qnew2} for an example.  Notice that the patch
+%contains the changes in our prior patch as part of its context (you
+%can see this more clearly in the output of \hgcmd{annotate}).
+
+$B%Q%C%A$X$N:n6H$,=*N;$7$?$j!$B>$N:n6H$r$r$9$kI,MW$,$"$k>l9g!$(B
+\hgxcmd{mq}{qnew}$B%3%^%s%I$r<B9T$7!$?7$7$$%Q%C%A$r:n$k$3$H$,$G$-$k!%(B
+Mercurial$B$O$3$N%Q%C%A$r4{B8$N%Q%C%A$N>e$+$iE,MQ$9$k!%?^(B~\ref{ex:mq:qnew2}$B$r(B
+$B;2>H$N$3$H!%%Q%C%A$O@h9T$9$k%Q%C%A$NJQ99$r%3%s%F%-%9%H$H$7$F;}$D!%!J(B\hgcmd{annotate}
+$B$N=PNO$G$h$jL@NF$K3NG'$9$k$3$H$,$G$-$k!%!K(B
 
 \begin{figure}[ht]
   \interaction{mq.tutorial.qnew2}
-  \caption{Stacking a second patch on top of the first}
+%  \caption{Stacking a second patch on top of the first}
+  \caption{$B:G=i$N%Q%C%A$N>e$K(B2$BHVL\$N%Q%C%A$r%9%?%C%/$9$k(B}
   \label{ex:mq:qnew2}
 \end{figure}
 
-So far, with the exception of \hgxcmd{mq}{qnew} and \hgxcmd{mq}{qrefresh}, we've
-been careful to only use regular Mercurial commands.  However, MQ
-provides many commands that are easier to use when you are thinking
-about patches, as illustrated in figure~\ref{ex:mq:qseries}:
+%So far, with the exception of \hgxcmd{mq}{qnew} and
+%\hgxcmd{mq}{qrefresh}, we've been careful to only use regular Mercurial
+%commands.  However, MQ provides many commands that are easier to use
+%when you are thinking about patches, as illustrated in
+%figure~\ref{ex:mq:qseries}:
+
+$B$3$l$^$G$O(B\hgxcmd{mq}{qnew}$B$H(B\hgxcmd{mq}{qrefresh}$B$r=|$$$F!$DL>o$N(B
+Mercurial$B%3%^%s%I$N$_$r;H$&$h$&$KCm0U$7$F$-$?!%$7$+$7(BMQ$B$O%Q%C%A$r07$&>l(B
+$B9g!$?^(B~\ref{ex:mq:qseries}$B$K<($9$h$&$J$h$j4JC1$J%3%^%s%I$rMQ0U$7$F$$$k!%(B
+
+%\begin{itemize}
+%\item The \hgxcmd{mq}{qseries} command lists every patch that MQ knows
+%  about in this repository, from oldest to newest (most recently
+%  \emph{created}).
+%\item The \hgxcmd{mq}{qapplied} command lists every patch that MQ has
+%  \emph{applied} in this repository, again from oldest to newest (most
+%  recently applied).
+%\end{itemize}
 
 \begin{itemize}
-\item The \hgxcmd{mq}{qseries} command lists every patch that MQ knows
-  about in this repository, from oldest to newest (most recently
-  \emph{created}).
-\item The \hgxcmd{mq}{qapplied} command lists every patch that MQ has
-  \emph{applied} in this repository, again from oldest to newest (most
-  recently applied).
+\item \hgxcmd{mq}{qseries}$B%3%^%s%I$O(BMQ$B$,4XCN$9$k%j%]%8%H%jFb$N%Q%C%AA4$F(B
+      $B$r8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
+\item \hgxcmd{mq}{qapplied}$B%3%^%s%I$O(BMQ$B$,(B\emph{$BE,MQ$7$?(B}$B%j%]%8%H%jFb$N(B
+      $B%Q%C%AA4$F$r$d$O$j8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
 \end{itemize}
 
 \begin{figure}[ht]
   \interaction{mq.tutorial.qseries}
-  \caption{Understanding the patch stack with \hgxcmd{mq}{qseries} and
-    \hgxcmd{mq}{qapplied}}
+%  \caption{Understanding the patch stack with \hgxcmd{mq}{qseries} and
+%    \hgxcmd{mq}{qapplied}}
+  \caption{\hgxcmd{mq}{qseries}$B$H(B\hgxcmd{mq}{qapplied}$B$G%Q%C%A%9%?%C%/$r(B
+ $BD4$Y$k(B}
   \label{ex:mq:qseries}
 \end{figure}
 
+
 %\subsection{Manipulating the patch stack}
 \subsection{$B%Q%C%A%9%?%C%/$NA`:n(B}
 
-The previous discussion implied that there must be a difference
-between ``known'' and ``applied'' patches, and there is.  MQ can
-manage a patch without it being applied in the repository.
+%The previous discussion implied that there must be a difference
+%between ``known'' and ``applied'' patches, and there is.  MQ can
+%manage a patch without it being applied in the repository.
+
+$B$3$l$^$G$N5DO@$O(B``known''$B$H(B``applied''$B%Q%C%A$K0c$$$,$"$k$3$H$r0EL[$K2>Dj(B
+$B$7$F$$$?!%(BMQ$B$O:90[$N$J$$%Q%C%A$r%j%]%8%H%j$KBP$7$FE,MQ$9$k$3$H$b$G$-$k!%(B
 
 An \emph{applied} patch has a corresponding changeset in the
 repository, and the effects of the patch and changeset are visible in