# HG changeset patch # User Yoshiki Yazawa # Date 1206863689 -32400 # Node ID 9ad5d69c4a37c4142200691f36f73ae263c9ca2b # Parent 110ebf968d3ff9b141227d6f27d97c29aa875491 more mq.tex diff -r 110ebf968d3f -r 9ad5d69c4a37 ja/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{パッチの再生} -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. - - +作業内容をセーブするポイントに差しかかったら，\hgxcmd{mq}{qrefresh}コマ +ンドを使って（図~\ref{ex:mq:qnew}）作業中のパッチを更新する．このコマン +ドはワーキングディレクトリの差分をパッチに取り込み，チェンジセットが変更 +を含むように更新する． \begin{figure}[ht] \interaction{mq.tutorial.qrefresh} - \caption{Refreshing a patch} +% \caption{Refreshing a patch} + \caption{パッチのリフレッシュ} \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}はいつでも好きな時に実行でき，作業の状態保存をする +のにも使える．パッチのリフレッシュは都合のよい時に行えばよい．実験的なコー +ドを動かす場合，事前にリフレッシュをしておけば，実験の結果コードが動かな +くても，\hgcmd{revert}すれば，変更は元に戻る． \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{パッチのリフレッシュで変更を蓄積する} \label{ex:mq:qrefresh2} \end{figure} %\subsection{Stacking and tracking patches} -\subsection{パッチの集積と追跡} +\subsection{パッチのスタックと追跡} -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}). + +パッチへの作業が終了したり，他の作業ををする必要がある場合， +\hgxcmd{mq}{qnew}コマンドを実行し，新しいパッチを作ることができる． +Mercurialはこのパッチを既存のパッチの上から適用する．図~\ref{ex:mq:qnew2}を +参照のこと．パッチは先行するパッチの変更をコンテキストとして持つ．（\hgcmd{annotate} +の出力でより明瞭に確認することができる．） \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{最初のパッチの上に2番目のパッチをスタックする} \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}: + +これまでは\hgxcmd{mq}{qnew}と\hgxcmd{mq}{qrefresh}を除いて，通常の +Mercurialコマンドのみを使うように注意してきた．しかしMQはパッチを扱う場 +合，図~\ref{ex:mq:qseries}に示すようなより簡単なコマンドを用意している． + +%\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}コマンドはMQが関知するリポジトリ内のパッチ全て + を古いものから新しく\emph{作成された}ものの順にリスト表示する． +\item \hgxcmd{mq}{qapplied}コマンドはMQが\emph{適用した}リポジトリ内の + パッチ全てをやはり古いものから新しく\emph{作成された}ものの順にリスト表示する． \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}と\hgxcmd{mq}{qapplied}でパッチスタックを + 調べる} \label{ex:mq:qseries} \end{figure} + %\subsection{Manipulating the patch stack} \subsection{パッチスタックの操作} -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. + +これまでの議論は``known''と``applied''パッチに違いがあることを暗黙に仮定 +していた．MQは差異のないパッチをリポジトリに対して適用することもできる． An \emph{applied} patch has a corresponding changeset in the repository, and the effects of the patch and changeset are visible in