changeset 303:268c49158a81

more 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{$B%P%C%/%"%&%H%W%m%;%9$r$h$j:Y$+$/@)8f$9$k(B}
 
-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.
+
+$BJQ99$r%P%C%/%"%&%H$9$k:]!$>o$K(B\hgopt{backout}{--merge}$B%*%W%7%g%s$r;H$&$3(B
+$B$H$r4+$a$?$,!$(B\hgcmd{backout}$B%3%^%s%I$G$O!$%P%C%/%"%&%H$9$k%A%'%s%8%;%C%H(B
+$B$r$I$N$h$&$K%^!<%8$9$k$+;XDj$9$k$3$H$,$G$-$k!%%P%C%/%"%&%H%W%m%;%9$r<j$G(B
+$B%3%s%H%m!<%k$9$kI,MW$O$[$H$s$I$J$$$O$:$@$,!$(B\hgcmd{backout}$B%3%^%s%I$,<+F0(B
+$B$G$I$N$h$&$KF0:n$7$F$$$k$N$+M}2r$9$k$N$K$OLrN)$D$+$bCN$l$J$$!%F0:n$r@bL@(B
+$B$9$k$?$a$K:G=i$N%j%]%8%H%j$N%/%m!<%s$r!$%P%C%/%"%&%H$r=|$$$F:n$C$F;O$a$k(B
+$B$3$H$K$7$h$&!%(B
+
+%\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}
+
+$BA0$K;H$C$?Nc$N$h$&$K!$(B3$BHVL\$N%A%'%s%8%;%C%H$r%3%_%C%H$7$?8e$G!$$=$N?F$r(B
+$B%P%C%/%"%&%H$7$F2?$,5/$-$k$+8+$F$_$h$&!%(B
+\interaction{backout.manual.backout} 
+
+$BA0$NNc$HF1MM$K!$?7$7$$%A%'%s%8%;%C%H$O%P%C%/%"%&%H$7$?%A%'%s%8%;%C%H$N;R(B
+$B$K$"$?$k!%$7$?$,$C$F?7$7$$%X%C%I$O%A%C%W$N;R$G$O(B\emph{$B$J$$(B}$B!%(B
+\hgcmd{backout}$B%3%^%s%I$O$3$N?F;R4X78$K$D$$$F$+$J$j$O$C$-$j$HI=<($9$k!%(B
+\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).
+
+$B$3$3$G$b%j%S%8%g%sMzNr$N%0%i%U(B\ref{fig:undo:backout-manual}$B$r8+$l$P!$2?$,(B
+$B5/$-$F$$$k$N$+M}2r$7$d$9$$!%%A%C%W0J30$NJQ99$r%P%C%/%"%&%H$9$k$?$a$K(B
+\hgcmd{backout}$B$r;H$C$?;~!$(BMercurial$B$,?7$7$$%X%C%I$r%j%]%8%H%j$KDI2C$9$k(B
+$B$N$,$o$+$k!%!J;M3Q$G<($5$l$?%3%_%C%H!%!K(B
 
 \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}$B%3%^%s%I$K$h$kJQ99$N%P%C%/%"%&%H(B}
   \label{fig:undo:backout-manual}
 \end{figure}