Mercurial > hgbook
diff ja/mq.tex @ 331:110ebf968d3f
more mq.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sun, 30 Mar 2008 14:51:01 +0900 |
parents | cadfd8bf5f15 |
children | 9ad5d69c4a37 |
line wrap: on
line diff
--- 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{$B?7$7$$%Q%C%A$N:n@.(B} -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}. + +$B?7$7$$%Q%C%A$r07$&;~$O(B\hgxcmd{mq}{qnew}$B%3%^%s%I$r;H$&!%$3$N%3%^%s%I$O:n@.(B +$B$5$l$k%Q%C%A$NL>A0$H$7$F0z?t$r(B1$B$D<h$k!%?^(B~\ref{ex:mq:qnew}$B$N$h$&$K!$(BMQ$B$O(B +$B$3$l$r(B\sdirname{.hg/patches} $B%G%#%l%/%H%jFb$N<B:]$N%U%!%$%kL>$H$7$FMxMQ$9(B +$B$k!%(B -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}$B%G%#%l%/%H%j$NCf$K$O!$(B\sfilename{series}$B$H(B +\sfilename{status}$B$H$$$&(B2$B$D$N%U%!%$%k$b?7$7$/:n$i$l$k!%(B +\sfilename{series}$B$U$!$$$k$O(BMQ$B$,4XCN$9$k!$$3$N%j%]%8%H%jFb$NA4$F$N%Q%C%A(B +$B$N%j%9%H$,$"$j!$0l9T$K0l$D$N%Q%C%A$,5-=R$5$l$F$$$k!%(BMercurial$B$O(B +\sfilename{status}$B%U%!%$%k$rFbIt$N4IM}$KMQ$$$k!%$3$N%U%!%$%k$O%j%]%8%H%j(B +$BFb$G(BMQ$B$,E,MQ$7$?A4$F$N%Q%C%A$,5-O?$5$l$F$$$k!%(B + +%\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. + $BNc$($P!$J#?t$N%Q%C%A$,E,MQ$5$l$k<j=g$rJQ99$9$k$J$I$NL\E*$G(B + \sfilename{series}$B%U%!%$%k$r<j$GJT=8$7$?$/$J$k$3$H$,$"$k$+$b$7$l$J$$!%(B + $B$7$+$7(B\sfilename{status}$B$r<j$GJT=8$9$k$N$O$[$H$s$I$N>l9gNI$/$J$$9M$($G!$(B + MQ$B$N>uBVDI@W$r4JC1$K68$o$;$F$7$^$&!%(B \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. + +$B?7$7$$%Q%C%A$r:n$C$?8e!$%o!<%-%s%0%G%#%l%/%H%jFb$N%U%!%$%k$rDL>oDL$jJT=8(B +$B$9$k$3$H$,$G$-$k!%(B\hgcmd{diff}$B$d(B\hgcmd{annotate}$B$N$h$&$JA4$F$NDL>o$N(B +Mercurial$B%3%^%s%I$,A4$/F1$8$h$&$K;H$($k!%(B %\subsection{Refreshing a patch} \subsection{$B%Q%C%A$N:F@8(B} @@ -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}