changeset 325:a8269a1b9164

more mq.tex

--- a/ja/mq.tex	Fri Mar 28 01:13:26 2008 +0900
+++ b/ja/mq.tex	Fri Mar 28 02:11:02 2008 +0900
@@ -241,19 +241,28 @@
 \section{$B%Q%C%A$H$O2?$+(B}
 \label{sec:mq:patch}
 
-Because MQ doesn't hide its patch-oriented nature, it is helpful to
-understand what patches are, and a little about the tools that work
-with them.
+%Because MQ doesn't hide its patch-oriented nature, it is helpful to
+%understand what patches are, and a little about the tools that work
+%with them.
+
+MQ$B$O%Q%C%A;X8~$G$"$k@-<A$r1#JC$7$F$$$J$$$N$G!$%Q%C%A$,2?$G$"$k$+!$%D!<%k(B
+$B$,%Q%C%A$r$I$&07$&$+$rM}2r$9$k$N$O$?$d$9$$!%(B
 
-The traditional Unix \command{diff} command compares two files, and
-prints a list of differences between them. The \command{patch} command
-understands these differences as \emph{modifications} to make to a
-file.  Take a look at figure~\ref{ex:mq:diff} for a simple example of
-these commands in action.
+%The traditional Unix \command{diff} command compares two files, and
+%prints a list of differences between them. The \command{patch} command
+%understands these differences as \emph{modifications} to make to a
+%file.  Take a look at figure~\ref{ex:mq:diff} for a simple example of
+%these commands in action.
+
+Unix$B$NEAE}E*$J(B\command{diff}$B%3%^%s%I$O(B2$B$D$N%U%!%$%k$rHf3S$7!$:9J,$N%j%9(B
+$B%H$r=PNO$9$k!%(B\command{patch}$B%3%^%s%I$O$3$N:9J,$rJQ99$H2r<a$7!$%U%!%$%k(B
+$B$K5Z$\$9!%?^(B~\ref{ex:mq:diff}$B$K$3$l$i$N%3%^%s%I$NF0:n$r<($9!%(B
 
 \begin{figure}[ht]
   \interaction{mq.dodiff.diff}
-  \caption{Simple uses of the \command{diff} and \command{patch} commands}
+%  \caption{Simple uses of the \command{diff} and \command{patch}
+ %  commands}
+  \caption{\command{diff}$B%3%^%s%I$H(B\command{patch}$B%3%^%s%I$NC1=c$J;HMQNc(B}
   \label{ex:mq:diff}
 \end{figure}
 
@@ -262,6 +271,9 @@
 difference between a patch and a diff.  (We'll use the term ``patch'',
 since it's more commonly used.)
 
+
+
+
 A patch file can start with arbitrary text; the \command{patch}
 command ignores this text, but MQ uses it as the commit message when
 creating changesets.  To find the beginning of the patch content,
@@ -1141,17 +1153,27 @@
 section~\ref{sec:mq:combine}.
 
 %\section{Differences between quilt and MQ}
-\section{$B%-%k%H$H(BMQ$B$N0c$$(B}
+\section{quilt$B$H(BMQ$B$N0c$$(B}
 
-If you are already familiar with quilt, MQ provides a similar command
-set.  There are a few differences in the way that it works.
+%If you are already familiar with quilt, MQ provides a similar command
+%set.  There are a few differences in the way that it works.
+
+$B$9$G$K(Bquilt$B$KFk@w$s$G$$$k%f!<%6$N$?$a$K!$(BMQ$B$OF1MM$N%3%^%s%I%;%C%H$rMQ0U(B
+$B$7$F$$$k!%%3%^%s%I$N5sF0$K$O2?E@$+0c$$$,$"$k!%(B
 
-You will already have noticed that most quilt commands have MQ
-counterparts that simply begin with a ``\texttt{q}''.  The exceptions
-are quilt's \texttt{add} and \texttt{remove} commands, the
-counterparts for which are the normal Mercurial \hgcmd{add} and
-\hgcmd{remove} commands.  There is no MQ equivalent of the quilt
-\texttt{edit} command.
+%You will already have noticed that most quilt commands have MQ
+%counterparts that simply begin with a ``\texttt{q}''.  The exceptions
+%are quilt's \texttt{add} and \texttt{remove} commands, the
+%counterparts for which are the normal Mercurial \hgcmd{add} and
+%\hgcmd{remove} commands.  There is no MQ equivalent of the quilt
+%\texttt{edit} command.
+
+$B$9$G$K$[$H$s$I$N(Bquilt$B%3%^%s%I$K$O!$BP1~$9$k(B``\texttt{q}''$B$G;O$^$k(BMQ$B%3%^%s(B
+$B%I$,$"$k$3$H$K5$$E$$$F$$$k$3$H$H;W$&!%Nc30$O!$(Bquilt$B$N(B\texttt{add}$B%3%^%s%I(B
+$B$H(B\texttt{remove}$B%3%^%s%I$G!$$3$l$i$K$O$=$l$>$lDL>o$N(BMercurial$B%3%^%s%I$N(B
+\hgcmd{add}$B$H(B\hgcmd{remove}$B$,BP1~$9$k!%$^$?!$(Bquilt$B$N(B\texttt{edit}$B%3%^%s%I(B
+$B$KBP1~$9$k(BMQ$B%3%^%s%I$O$J$$!%(B
+
 
 %%% Local Variables: 
 %%% mode: yatex