# HG changeset patch # User Yoshiki Yazawa # Date 1206856261 -32400 # Node ID 110ebf968d3ff9b141227d6f27d97c29aa875491 # Parent cadfd8bf5f153dde412154aa9de5dafe682577f7 more mq.tex diff -r cadfd8bf5f15 -r 110ebf968d3f ja/mq.tex --- a/ja/mq.tex Sun Mar 30 06:13:35 2008 +0900 +++ b/ja/mq.tex Sun Mar 30 14:51:01 2008 +0900 @@ -462,30 +462,53 @@ %\subsection{Creating a new patch} \subsection{新しいパッチの作成} -To begin work on a new patch, use the \hgxcmd{mq}{qnew} command. This -command takes one argument, the name of the patch to create. MQ will -use this as the name of an actual file in the \sdirname{.hg/patches} -directory, as you can see in figure~\ref{ex:mq:qnew}. +%To begin work on a new patch, use the \hgxcmd{mq}{qnew} command. This +%command takes one argument, the name of the patch to create. MQ will +%use this as the name of an actual file in the \sdirname{.hg/patches} +%directory, as you can see in figure~\ref{ex:mq:qnew}. + +新しいパッチを扱う時は\hgxcmd{mq}{qnew}コマンドを使う.このコマンドは作成 +されるパッチの名前として引数を1つ取る.図~\ref{ex:mq:qnew}のように,MQは +これを\sdirname{.hg/patches} ディレクトリ内の実際のファイル名として利用す +る. -Also newly present in the \sdirname{.hg/patches} directory are two -other files, \sfilename{series} and \sfilename{status}. The -\sfilename{series} file lists all of the patches that MQ knows about -for this repository, with one patch per line. Mercurial uses the -\sfilename{status} file for internal book-keeping; it tracks all of the -patches that MQ has \emph{applied} in this repository. +%Also newly present in the \sdirname{.hg/patches} directory are two +%other files, \sfilename{series} and \sfilename{status}. The +%\sfilename{series} file lists all of the patches that MQ knows about +%for this repository, with one patch per line.Mercurial uses the +%\sfilename{status} file for internal book-keeping; it tracks all of the +%patches that MQ has \emph{applied} in this repository. + +\sdirname{.hg/patches}ディレクトリの中には,\sfilename{series}と +\sfilename{status}という2つのファイルも新しく作られる. +\sfilename{series}ふぁいるはMQが関知する,このリポジトリ内の全てのパッチ +のリストがあり,一行に一つのパッチが記述されている.Mercurialは +\sfilename{status}ファイルを内部の管理に用いる.このファイルはリポジトリ +内でMQが適用した全てのパッチが記録されている. + +%\begin{note} +% You may sometimes want to edit the \sfilename{series} file by hand; +% for example, to change the sequence in which some patches are +% applied. However, manually editing the \sfilename{status} file is +% almost always a bad idea, as it's easy to corrupt MQ's idea of what +% is happening. +%\end{note} \begin{note} - You may sometimes want to edit the \sfilename{series} file by hand; - for example, to change the sequence in which some patches are - applied. However, manually editing the \sfilename{status} file is - almost always a bad idea, as it's easy to corrupt MQ's idea of what - is happening. + 例えば,複数のパッチが適用される手順を変更するなどの目的で + \sfilename{series}ファイルを手で編集したくなることがあるかもしれない. + しかし\sfilename{status}を手で編集するのはほとんどの場合良くない考えで, + MQの状態追跡を簡単に狂わせてしまう. \end{note} -Once you have created your new patch, you can edit files in the -working directory as you usually would. All of the normal Mercurial -commands, such as \hgcmd{diff} and \hgcmd{annotate}, work exactly as -they did before. +%Once you have created your new patch, you can edit files in the +%working directory as you usually would. All of the normal Mercurial +%commands, such as \hgcmd{diff} and \hgcmd{annotate}, work exactly as +%they did before. + +新しいパッチを作った後,ワーキングディレクトリ内のファイルを通常通り編集 +することができる.\hgcmd{diff}や\hgcmd{annotate}のような全ての通常の +Mercurialコマンドが全く同じように使える. %\subsection{Refreshing a patch} \subsection{パッチの再生} @@ -496,6 +519,9 @@ the working directory into your patch, and updates its corresponding changeset to contain those changes. + + + \begin{figure}[ht] \interaction{mq.tutorial.qrefresh} \caption{Refreshing a patch}