# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1202483610 -32400
# Node ID 268c49158a817b7937337ac0492af043f623dc94
# Parent  6a31e428ba3bd4c5a9948cd5889489ec7916e47f
more undo.tex

diff -r 6a31e428ba3b -r 268c49158a81 ja/undo.tex
--- a/ja/undo.tex	Fri Feb 08 21:43:34 2008 +0900
+++ b/ja/undo.tex	Sat Feb 09 00:13:30 2008 +0900
@@ -547,35 +547,62 @@
 %\subsection{Gaining more control of the backout process}
 \subsection{バックアウトプロセスをより細かく制御する}
 
-While I've recommended that you always use the
-\hgopt{backout}{--merge} option when backing out a change, the
-\hgcmd{backout} command lets you decide how to merge a backout
-changeset.  Taking control of the backout process by hand is something
-you will rarely need to do, but it can be useful to understand what
-the \hgcmd{backout} command is doing for you automatically.  To
-illustrate this, let's clone our first repository, but omit the
-backout change that it contains.
+%While I've recommended that you always use the
+%\hgopt{backout}{--merge} option when backing out a change, the
+%\hgcmd{backout} command lets you decide how to merge a backout
+%changeset.  Taking control of the backout process by hand is something
+%you will rarely need to do, but it can be useful to understand what
+%the \hgcmd{backout} command is doing for you automatically. To
+%illustrate this, let's clone our first repository, but omit the
+%backout change that it contains.
+
+変更をバックアウトする際，常に\hgopt{backout}{--merge}オプションを使うこ
+とを勧めたが，\hgcmd{backout}コマンドでは，バックアウトするチェンジセット
+をどのようにマージするか指定することができる．バックアウトプロセスを手で
+コントロールする必要はほとんどないはずだが，\hgcmd{backout}コマンドが自動
+でどのように動作しているのか理解するのには役立つかも知れない．動作を説明
+するために最初のリポジトリのクローンを，バックアウトを除いて作って始める
+ことにしよう．
+
+%\interaction{backout.manual.clone}
+%As with our earlier example, We'll commit a third changeset, then back
+%out its parent, and see what happens.
+%\interaction{backout.manual.backout} 
+%Our new changeset is again a descendant of the changeset we backout
+%out; it's thus a new head, \emph{not} a descendant of the changeset
+%that was the tip.  The \hgcmd{backout} command was quite explicit in
+%telling us this.
+%\interaction{backout.manual.log}
+%
+%\interaction{backout.manual.clone}
+
+前に使った例のように，3番目のチェンジセットをコミットした後で，その親を
+バックアウトして何が起きるか見てみよう．
+\interaction{backout.manual.backout} 
+
+前の例と同様に，新しいチェンジセットはバックアウトしたチェンジセットの子
+にあたる．したがって新しいヘッドはチップの子では\emph{ない}．
+\hgcmd{backout}コマンドはこの親子関係についてかなりはっきりと表示する．
+\interaction{backout.manual.log}
 
 \interaction{backout.manual.clone}
-As with our earlier example, We'll commit a third changeset, then back
-out its parent, and see what happens.
-\interaction{backout.manual.backout} 
-Our new changeset is again a descendant of the changeset we backout
-out; it's thus a new head, \emph{not} a descendant of the changeset
-that was the tip.  The \hgcmd{backout} command was quite explicit in
-telling us this.
-\interaction{backout.manual.log}
 
-Again, it's easier to see what has happened by looking at a graph of
-the revision history, in figure~\ref{fig:undo:backout-manual}.  This
-makes it clear that when we use \hgcmd{backout} to back out a change
-other than the tip, Mercurial adds a new head to the repository (the
-change it committed is box-shaped).
+%Again, it's easier to see what has happened by looking at a graph of
+%the revision history, in figure~\ref{fig:undo:backout-manual}.This
+%makes it clear that when we use \hgcmd{backout} to back out a change
+%other than the tip, Mercurial adds a new head to the repository (the
+%change it committed is box-shaped).
+
+ここでもリビジョン履歴のグラフ\ref{fig:undo:backout-manual}を見れば，何が
+起きているのか理解しやすい．チップ以外の変更をバックアウトするために
+\hgcmd{backout}を使った時，Mercurialが新しいヘッドをリポジトリに追加する
+のがわかる．（四角で示されたコミット．）
 
 \begin{figure}[htb]
   \centering
   \grafix{undo-manual}
-  \caption{Backing out a change using the \hgcmd{backout} command}
+%  \caption{Backing out a change using the \hgcmd{backout} command}
+  \caption{\hgcmd{backout}コマンドによる変更のバックアウト}
   \label{fig:undo:backout-manual}
 \end{figure}