Mercurial > hgbook
changeset 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 11 Jul 2009 19:25:35 +0900 |
| parents | 896ab6eaf1c6 |
| children | d819bc2414f4 |
| files | ja/branch.tex ja/cmdref.tex ja/collab.tex ja/concepts.tex ja/daily.tex ja/filenames.tex ja/hgext.tex ja/hook.tex ja/intro.tex ja/mq-collab.tex ja/mq-ref.tex ja/mq.tex ja/preface.tex ja/srcinstall.tex ja/template.tex ja/tour-basic.tex ja/tour-merge.tex ja/undo.tex |
| diffstat | 18 files changed, 298 insertions(+), 308 deletions(-) [+] |
line wrap: on
line diff
--- a/ja/branch.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/branch.tex Sat Jul 11 19:25:35 2009 +0900 @@ -17,7 +17,7 @@ %they're based, but with a few bugs fixed. $BB?$/$N%=%U%H%&%'%"%W%m%8%'%/%H$G$O!$?75!G=$r;}$D%a%8%c!<%j%j!<%9$rDj4|E*(B -$B$K%j%j!<%9$9$k!%JB9T$7$FB??t$N%^%$%J!<%j%j!<%9$b9T$J$o$l$k!%$3$l$i$O%a(B +$B$K%j%j!<%9$9$k!%JB9T$7$FB??t$N%^%$%J!<%j%j!<%9$b9T$o$l$k!%$3$l$i$O%a(B $B%8%c!<%j%j!<%9$N%P%0$r=$@5$7$?$b$N$G$"$k!%(B %In this chapter, we'll start by talking about how to keep records of @@ -67,11 +67,11 @@ %\item Newline (ASCII 10, ``\Verb+\n+'') %\end{itemize} -$B%?%0$O<B$N$H$3$m%j%S%8%g%s$KIU$1$i$l$?%7%s%\%j%C%/%M!<%`$KB>$J$i$J$$!%%?(B -$B%0$OC1$K%f!<%6$NJX59$N$?$a$KIU$1$i$l$k!%%?%0$OFCDj$N%j%S%8%g%s$r;2>H$9$k(B -$B$?$a$N<j7Z$G1JB3E*$JJ}K!$G!$(BMercurial$B$O%?%0$rK]Lu$7$J$$!%%?%0$NL>A0$K$O!$(B -$BL@3N$K%Q!<%9$9$k$?$a$N$$$/$D$+$N$b$N0J30$N@)8B$O$J$$!%%?%0%M!<%`$O0J2<$N(B -$BJ8;z$r4^$`$3$H$O$G$-$J$$!%(B +$B%?%0$O<B$N$H$3$m%j%S%8%g%s$KIU$1$i$l$?%7%s%\%kL>$KB>$J$i$J$$!%%?%0$OC1$K(B +$B%f!<%6$NJX59$N$?$a$KIU$1$i$l$k!%%?%0$OFCDj$N%j%S%8%g%s$r;2>H$9$k$?$a$N<j(B +$B7Z$G1JB3E*$JJ}K!$G!$(BMercurial$B$O%?%0$rK]Lu$7$J$$!%%?%0$NL>A0$K$O!$L@3N$K%Q!<(B +$B%9$9$k$?$a$KI,MW$J$$$/$D$+$N$b$N0J30$K@)8B$O$J$$!%%?%0%M!<%`$O0J2<$NJ8;z(B +$B$r4^$`$3$H$O$G$-$J$$!%(B \begin{itemize} \item $B%3%m%s(B (ASCII 58, ``\texttt{:}'') \item $BI|5"J8;z(B (ASCII 13, ``\Verb+\r+'') @@ -82,7 +82,7 @@ %You can use the \hgcmd{tags} command to display the tags present in %your repository. In the output, each tagged revision is identified %first by its name, then by revision number, and finally by the unique -%hash of the revision. +%hash of the revision. %\interaction{tag.tags} %Notice that \texttt{tip} is listed in the output of \hgcmd{tags}. The %\texttt{tip} tag is a special ``floating'' tag, which always @@ -133,9 +133,9 @@ $B%j%]%8%H%j$NCf$G;H$($k%?%0?t!$0l$D$N%j%S%8%g%s$KIU$1$i$l$k%?%0?t$K>e8B$O(B $B$J$$!%;v>p$O%W%m%8%'%/%H$K$h$C$F0[$J$k$@$m$&$,!$<BMQE*$K$O%?%0$rB?$/IU$1(B -$B$9$.$k$3$H$O$"$^$jNI$$9M$($H$O8@$($J$$!%%?%0$H$O%j%S%8%g%s$r8+$D$10W$/$9(B -$B$k$?$a$K;H$&$b$N$@$+$i$@!%%?%0$rB?$/IU$1$9$.$k$H!$%?%0$K$h$C$F%j%S%8%g%s(B -$B$N6hJL$r$9$k$3$H$,$H$?$s$KFq$7$/$J$k!%(B +$B$9$.$k$3$H$O$"$^$jNI$$9M$($H$O8@$($J$$!%%?%0$H$O%j%S%8%g%s$r8+$D$1$d$9$/(B +$B$9$k$?$a$K;H$&$b$N$@$+$i$@!%%?%0$rB?$/IU$1$9$.$k$H!$%?%0$K$h$C$F%j%S%8%g(B +$B%s$N6hJL$r$9$k$3$H$,$H$?$s$KFq$7$/$J$k!%(B %For example, if your project has milestones as frequent as every few %days, it's perfectly reasonable to tag each one of those. But if you @@ -281,9 +281,9 @@ %remind you of something like ``Anne saw the symptoms with this %revision''. -Mercurial$B$N%?%0$O%j%S%8%g%s%3%s%H%m!<%k$5$l!$%W%m%8%'%/%HMzNr$KIU?o$7$F$$(B -$B$k$?$a!$F1$8%W%m%8%'%/%H$GF/$/?M$O3'%?%0$rCN$k$3$H$K$J$k!%%j%S%8%g%s$KL>(B -$BA0$rIU$1$k$3$H$O!$C1$K%j%S%8%g%s(B\texttt{4237e45506ee}$B$,%P!<%8%g%s(B +Mercurial$B$N%?%0$O%j%S%8%g%s%3%s%H%m!<%k$5$l!$%W%m%8%'%/%H$NMzNr$KIU?o$7$F(B +$B$$$k$?$a!$F1$8%W%m%8%'%/%H$GF/$/?M$O3'%?%0$rCN$k$3$H$K$J$k!%%j%S%8%g%s$K(B +$BL>A0$rIU$1$k$3$H$O!$C1$K%j%S%8%g%s(B\texttt{4237e45506ee}$B$,%P!<%8%g%s(B \texttt{v2.0.2}$B$G$"$k$H5-=R$9$k0J>e$N0UL#$r;}$D!%$b$7%P%0$rDI@W$7$F$$$k$J(B $B$i!$(B``Anne saw the symptoms with this revision''$B!J%"%s$O$3$N%j%S%8%g%s$G(B $B>I>u$r8+$?!K$J$I$N%?%0$rIU$1$?$/$J$k$@$m$&!%(B @@ -318,9 +318,10 @@ %release to the last main release; and an unexpected ``hot fix'' to an %old release that is now in maintenance mode. -$B?7$7$$(B``main''$B$r%j%j!<%9$9$k>u67$G!$:G?7$N%a%$%s%j%j!<%9$KBP$9$k?7$7$$>.(B -$B5,LO$J%P%0%U%#%C%/%9%j%j!<%9$H4{$K%a%s%F%J%s%9%b!<%I$K$J$C$F$$$k8E$$%j%j!<(B -$B%98~$1$NM=4|$;$L(B``hot fix'' $B$r%j%j!<%9$9$k>u67$r9M$($k!%(B +$B?7$7$$(B``main''$B$r%j%j!<%9$9$k=`Hw$K$+$+$C$F$$$k>uBV$G!$:G?7$N%a%$%s%j%j!<(B +$B%9$KBP$9$k?7$7$$>.5,LO$J%P%0%U%#%C%/%9%j%j!<%9$H!$4{$K%a%s%F%J%s%9%b!<%I(B +$B$K$J$C$F$$$k8E$$%j%j!<%98~$1$N7W2h30$N(B``hot fix''$B$r%j%j!<%9$9$k>u67$r9M$((B +$B$k!%(B %The usual way people refer to these different concurrent directions of @@ -362,7 +363,7 @@ %of that tag. %\interaction{branch-repo.clone} -Mercurial$B$G(B``bit picture''$B$r3VN%$9$k:G$b4JC1$JJ}K!$O!$@lMQ$N%j%]%8%H%j$r(B +Mercurial$B$G(B``big picture''$B$r3VN%$9$k:G$b4JC1$JJ}K!$O!$@lMQ$N%j%]%8%H%j$r(B $BMQ0U$9$k$3$H$G$"$k!%$b$70l$D$N6&M-%j%]%8%H%j$r;}$C$F$$$k>l9g!$$3$l$r(B \texttt{myproject}$B$H8F$V$3$H$K$7$k!%$3$l$,(B``1.0''$B%^%$%k%9%H!<%s$KE~C#$7$?(B $B$i!$(B1.0$B$K(B1.0$B%j%j!<%9$H%?%0$rIU$1!$>-Mh$N%a%s%F%J%s%9%j%j!<%9$KHw$($k$3$H(B @@ -431,7 +432,7 @@ $BB?$/$N>l9g!$%V%i%s%AKh$KJ#?t$N%j%]%8%H%j$rMQ0U$73VN%$9$k$N$O@5$7$$%"%W%m!<(B $B%A$G$"$k!%$3$l$OC1=c$J$?$aGD0.$,MF0W$G$"$j!$<:GT$rHH$92DG=@-$,Dc$$!%:n6H(B $B$7$F$$$k%V%i%s%A$H%G%#%l%/%H%j$N4V$K$O(B1$BBP(B1$B$N4X78$,$"$k!%(BMercurial$B$r9MN8$7(B -$B$J$$DL>o$N%D!<%k$r%V%i%s%A!?%j%]%8%H%jFb$N%U%!%$%k$KBg$7$F;H$&$3$H$b2DG=(B +$B$J$$DL>o$N%D!<%k$r%V%i%s%A!?%j%]%8%H%jFb$N%U%!%$%k$KBP$7$F;H$&$3$H$b2DG=(B $B$G$"$k!%(B %If you're more in the ``power user'' category (\emph{and} your @@ -514,10 +515,10 @@ $B$+J,$+$i$J$$$+$b$7$l$J$$!%(B\hgcmd{status}$B%3%^%s%I$H(B\hgcmd{tip}$B%3%^%s%I$O(B $B$=$l$>$l2?$rI=<($9$k$@$m$&$+!)(B \interaction{branch-named.status} -$B%o!<%-%s%0%G%#%l%/%H%jFb$G$O2?$bJQ2=$O5/$-$:!$2?$N%R%9%H%j$b@8@.$5$l$F$$(B -$B$J$$!%$3$l$+$iJ,$+$k$h$&$K!$(B\hgcmd{branch}$B%3%^%s%I$r<B9T$7$F$b!$1JB3E*$J(B -$B8z2L$O2?$b5/$-$J$$!%$3$N%3%^%s%I$O(B\emph{$B<!$N(B}$B%A%'%s%8%;%C%H$N%3%_%C%H$,(B -$B$I$N%V%i%s%A$KBP$7$F9T$o$l$k$+$r(BMercurial$B%3%^%s%I$K<($9$N$K;H$o$l$k!%(B +$B%o!<%-%s%0%G%#%l%/%H%jFb$G$O2?$bJQ2=$O5/$-$:!$2?$NMzNr$b@8@.$5$l$F$$$J(B +$B$$!%$3$l$+$iJ,$+$k$h$&$K!$(B\hgcmd{branch}$B%3%^%s%I$r<B9T$7$F$b!$1JB3E*$J8z(B +$B2L$O2?$b5/$-$J$$!%$3$N%3%^%s%I$O(B\emph{$B<!$N(B}$B%A%'%s%8%;%C%H$N%3%_%C%H$,$I$N(B +$B%V%i%s%A$KBP$7$F9T$o$l$k$+$r(BMercurial$B%3%^%s%I$K<($9$N$K;H$o$l$k!%(B %When you commit a change, Mercurial records the name of the branch on %which you committed. Once you've switched from the \texttt{default} @@ -540,7 +541,7 @@ %Once you've named a branch and committed a change with that name, %every subsequent commit that descends from that change will inherit %the same branch name. You can change the name of a branch at any -%time, using the \hgcmd{branch} command. +%time, using the \hgcmd{branch} command. %\interaction{branch-named.rebranch} %In practice, this is something you won't do very often, as branch %names tend to have fairly long lifetimes. (This isn't a rule, just an @@ -548,7 +549,7 @@ $B%V%i%s%A$KL>A0$rIU$1!$$=$NL>A0$r;H$C$FJQ99$N%3%_%C%H$r9T$&$H!$0J8e$KB3$/(B $BA4$F$N%3%_%C%H$OF1$8L>A0$r;}$D!%L>A0$NJQ99$O(B\hgcmd{branch}$B%3%^%s%I$r;H$&$3(B -$B$H$G$O$$$D$G$b2DG=$@!%(B +$B$H$G$$$D$G$b2DG=$@!%(B \interaction{branch-named.rebranch} $B<BMQ$K$*$$$F$O!$%V%i%s%AL>$O$+$J$jD9$$4|4V;H$o$l$k798~$,$"$j!$JQ99$OIQHK(B $B$K$O9T$o$l$J$$!%!J$3$l$OK!B'$H8@$($k$h$&$J$b$N$G$O$J$/!$C1$J$k4QB,7k2L$G(B @@ -580,9 +581,9 @@ %We're on the \texttt{bar} branch, but there also exists an older %\texttt{foo} branch. -$B$3$N$U$k$^$$$O$d$d4q0[$+$b$7$l$J$$!%<B:]$NF0:n$r8+$F$_$k$3$H$K$9$k!%$^$:(B -$B2f!9$,$I$N%V%i%s%A$K$$$k$+$rD4$Y!$%j%]%8%H%j$K$I$s$J%V%i%s%A$,$"$k$+8+$F(B -$B$_$h$&!%(B +$B$3$N?6Iq$$$O$d$d4q0[$+$b$7$l$J$$!%<B:]$NF0:n$r8+$F$_$k$3$H$K$9$k!%$^$:2f!9(B +$B$,$I$N%V%i%s%A$K$$$k$+$rD4$Y!$%j%]%8%H%j$K$I$s$J%V%i%s%A$,$"$k$+8+$F$_$h(B +$B$&!%(B \interaction{branch-named.parents} $B:#$$$k$N$O(B\texttt{bar}$B%V%i%s%A$G!$(B\texttt{foo}$B%V%i%s%A$bB8:_$9$k!%(B @@ -639,7 +640,7 @@ $B$3$l$O%^!<%8$N:]$K(BMercurial$B$,%V%i%s%AL>$r$I$N$h$&$KA*$V$+$K1F6A$rM?$($k!%(B $B%^!<%88e!"%^!<%8$N7k2L$r%3%_%C%H$9$k:]$K(BMercurial$B$O(B1$BHVL\$N?F$N%V%i%s%AL>(B $B$rMQ$$$k!%(B1$BHVL\$N?F$N%V%i%s%AL>$,(B\texttt{foo}$B$G!$(B\texttt{bar}$B$H%^!<%8$r(B -$B9T$J$C$?$H$9$k$H!$%^!<%88e$N%V%i%s%AL>$O(B\texttt{foo}$B$H$J$k!%(B +$B9T$C$?$H$9$k$H!$%^!<%88e$N%V%i%s%AL>$O(B\texttt{foo}$B$H$J$k!%(B %It's not unusual for a repository to contain multiple heads, each with %the same branch name. Let's say I'm working on the \texttt{foo} @@ -650,7 +651,7 @@ 1$B$D$N%j%]%8%H%j$,F1$8%V%i%s%AL>$r;}$D$$$/$D$b$N(Bhead$B$r;}$C$F$$$k$3$H$ODA$7(B $B$$$3$H$G$O$J$$!%:#!$;d$H$"$J$?$,F1$8(B\texttt{foo}$B%V%i%s%A$G:n6H$r$7$F$*$j!$(B -$B$=$l$>$l0[$J$C$?JQ99$r%3%_%C%H$9$k$H$7$h$&!%$"$J$?$N9T$J$C$?JQ99$r;d$,(B +$B$=$l$>$l0[$J$C$?JQ99$r%3%_%C%H$9$k$H$7$h$&!%$"$J$?$N9T$C$?JQ99$r;d$,(B pull$B$9$k$H!$;d$O(B\texttt{foo}$B%V%i%s%A$K(B2$B$D$N(Bhead$B$r;}$D$3$H$K$J$k!%%^!<%8(B $B$N7k2L$O!$$"$J$?$,4|BT$9$k$h$&$K(B\texttt{foo}$B%V%i%s%A>e$G(B1$B$D$N(Bhead$B$K$J$k!%(B @@ -660,7 +661,7 @@ %\interaction{branch-named.merge} $B$7$+$7!$;d$,(B\texttt{bar}$B%V%i%s%A$G:n6H$r$7$F$$$F!$(B\texttt{foo}$B%V%i%s%A$+(B -$B$i%^!<%8$r9T$J$&$H!$@.2LJ*$O(B\texttt{bar}$B%V%i%s%A$K;D$k$3$H$K$J$k!%(B +$B$i%^!<%8$r9T$&$H!$@.2LJ*$O(B\texttt{bar}$B%V%i%s%A$K;D$k$3$H$K$J$k!%(B \interaction{branch-named.merge} %To give a more concrete example, if I'm working on the @@ -671,7 +672,7 @@ $B$b$C$H6qBNE*$JNc$r5s$2$k$H!$$b$7;d$,(B\texttt{bleeding-edge}$B%V%i%s%A$G:n6H(B $B$r$7$F$$$F!$(B\texttt{stable}$B%V%i%s%A$N?7$7$$=$@5$r<h$j9~$`$?$a$K(B -\texttt{stable}$B$+$i(Bpull$B$H(Bmerge$B$r9T$J$&$H!$(BMercurial$B$O(B``$B@5$7$$(B''$B%V%i%s%AL>(B +\texttt{stable}$B$+$i(Bpull$B$H(Bmerge$B$r9T$&$H!$(BMercurial$B$O(B``$B@5$7$$(B''$B%V%i%s%AL>(B (\texttt{bleeding-edge})$B$rA*$V!%(B %\section{Branch naming is generally useful} @@ -710,8 +711,8 @@ $B6&M-%j%]%8%H%j$r;H$C$F:n6H$7$F$$$k>l9g!$(B\hook{pretxnchangegroup}$B%U%C%/$r(B $B@_Dj$9$k$3$H$G4V0c$C$?%V%i%s%AL>$r;}$D99?7$r%V%m%C%/$9$k$3$H$,$G$-$k!%$3(B $B$l$ONc$($P(B``$B:G@hC<(B''$B%V%i%s%A$+$i(B``$B0BDj(B''$B%V%i%s%A$XJQ99$r(Bpush$B$9$k$h$&$J4V(B -$B0c$$$rKI$0$N$K%7%s%W%k$+$D8z2LE*$JJ}K!$G$"$k!%%U%C%/$O!$Nc$($P6&M-%j%]%8(B -$B%H%j$N(B \hgrc $B$K(B +$B0c$$$rKI$0$N$K%7%s%W%k$+$D8z2LE*$JJ}K!$G$"$k!%%U%C%/$O!$6&M-%j%]%8%H%j$N(B +\hgrc $B$K(B \begin{codesample2} [hooks] pretxnchangegroup.branch = hg heads --template '{branches} ' | grep mybranch @@ -719,7 +720,7 @@ $B$N$h$&$K5-=R$5$l$k!%(B -%%% Local Variables: +%%% Local Variables: %%% mode: yatex %%% TeX-master: "00book" -%%% End: +%%% End:
--- a/ja/cmdref.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/cmdref.tex Sat Jul 11 19:25:35 2009 +0900 @@ -61,7 +61,7 @@ %all of them. $B$3$N%*%W%7%g%s$,;XDj$5$l$J$1$l$P(B\hgcmd{diff}$B$O%P%$%J%j$HH=Dj$5$l$?%U%!%$(B -$B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$J$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B +$B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B \hgcmd{diff}$B$OA4$F$N%U%!%$%k$r%F%-%9%H$H$7$F07$$!$A4$F$N%U%!%$%k$KBP$7$F(B diff$B$r@8@.$9$k!%(B @@ -69,9 +69,9 @@ %few embedded NUL characters. If you use it on files that contain a %lot of binary data, its output will be incomprehensible. -$B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K(BNUL$BJ8;z$r4^$s$G$$$k$h$&$J%U%!(B -$B%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k%U%!(B -$B%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B +$B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K%L%kJ8;z$r4^$s$G$$$k$h$&$J(B +$B%U%!%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k(B +$B%U%!%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B \optref{diff}{b}{ignore-space-change} @@ -97,7 +97,7 @@ %\interaction{cmdref.diff-p} $B%O%s%/%X%C%@$NCf$K4^$^$l$F$$$k4X?t$NL>A0$rI=<($9$k!%8!:w$OC1=c$JH/8+E*J}(B -$BK!$G9T$J$&!%$3$N5!G=$O%G%U%)%k%H$GM-8z$K$5$l$F$*$j!$(B\hgopt{diff}{-p}$B%*%W(B +$BK!$G9T$&!%$3$N5!G=$O%G%U%)%k%H$GM-8z$K$5$l$F$*$j!$(B\hgopt{diff}{-p}$B%*%W(B $B%7%g%s$O2<$NNc$N$h$&$K(B\rcitem{diff}{showfunc}$B@_Dj$rJQ99$5$l$k$^$G0UL#$r$J(B $B$5$J$$!%(B \interaction{cmdref.diff-p}
--- a/ja/collab.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/collab.tex Sat Jul 11 19:25:35 2009 +0900 @@ -133,8 +133,8 @@ $B%`$K$H$C$F$OBg$-$J6C$-$H3kF#$rM?$($F$7$^$C$?$3$H$,$"$k!%J#;($J%V%i%s%A$N(B $B=89g$,$J$<I,MW$J$N$+JQ99$,%V%i%s%A4V$G$I$N$h$&$KEAGE$9$k$N$+$r@bL@$7$?$K(B $B$b$+$+$o$i$:!$4v?M$+$N%A!<%`%a%s%P!<$OH?H/$7$?!%H`$i$OAoL@$G$"$C$?$,!$;d(B -$B$,94$C$?%k!<%k$,:n6H$KM?$($k@)8B$d!$%b%G%k$N:YIt$KM?$($k1F6A$KCm0U$rJ'$&(B -$B$3$H$OK>$^$J$+$C$?!%(B +$B$N94$C$?%k!<%k$,:n6H$KM?$($k@)8B$d!$%b%G%k$N:YIt$KM?$($k1F6A$KCm0U$rJ'$&(B +$B$3$H$rK>$^$J$+$C$?!%(B %Don't sweep foreseeable social or technical problems under the rug. %Whatever scheme you put into effect, you should plan for mistakes and @@ -506,12 +506,12 @@ Linus$B$OB?$/$N(B``$B?.Mj$G$-$kBe9T<T(B''$B$r;}$C$F$$$k!%86B'E*$K$OH`$OH`$i$,8x3+$7(B $B$?$b$N$O2?$G$b(Bpull$B$9$k!%B?$/$N>l9g!$H`$i$NJQ99$r%l%S%e!<$9$k$3$H$b$7$J(B -$B$$!%Be9T<T$N2??M$+$O%a%s%F%J!<$H$J$k$3$H$rF10U$7$F$*$j!$%+!<%M%kFb$NFCDj(B -$B$N%5%V%7%9%F%`$KBP$7$F@UG$$r;}$D!%%+!<%M%k%O%C%+!<$NC/$+$,(BLinus$B$N%D%j!<$N(B -$B%5%V%7%9%F%`$KJQ99$r2C$($?$$$H;W$C$?$i!$%5%V%7%9%F%`$N%a%s%F%J!<$r8+$D$1(B -$B=P$7$?>e$G!$%a%s%F%J!<$KJQ99$r<h$j9~$s$GLc$&$h$&$K0MMj$9$kI,MW$,$"$k!%%a(B -$B%s%F%J!<$,JQ99$r%l%S%e!<$7!$<h$j9~$`$3$H$KF10U$9$l$P!$@5<0$J%3!<%9$GJQ99(B -$B$r(BLinus$B$K<jEO$9!%(B +$B$$!%Be9T<T$N2??M$+$O%a%s%F%J$H$J$k$3$H$rF10U$7$F$*$j!$%+!<%M%kFb$NFCDj$N(B +$B%5%V%7%9%F%`$KBP$7$F@UG$$r;}$D!%%+!<%M%k%O%C%+!<$NC/$+$,(BLinus$B$N%D%j!<$N%5(B +$B%V%7%9%F%`$KJQ99$r2C$($?$$$H;W$C$?$i!$%5%V%7%9%F%`$N%a%s%F%J$r8+$D$1=P$7(B +$B$?>e$G!$%a%s%F%J$KJQ99$r<h$j9~$s$GLc$&$h$&$K0MMj$9$kI,MW$,$"$k!%%a%s%F%J(B +$B$,JQ99$r%l%S%e!<$7!$<h$j9~$`$3$H$KF10U$9$l$P!$@5<0$J%3!<%9$GJQ99$r(BLinus$B$K(B +$B<jEO$9!%(B %Individual lieutenants have their own approaches to reviewing, %accepting, and publishing changes; and for deciding when to feed them @@ -553,13 +553,13 @@ %hasn't yet accepted, people with similar interests may pull your %changes regularly to keep up with your work. -$BBhFs$K!$$3$l$OI>H=$H>N;?$H$K$h$k%7%9%F%`$G$"$k$H$$$&$3$H$@!%L5L>$N3+H/<T(B -$B$NJQ99$KBP$7$F$O(BLinus$B$O$*$=$i$/H?1~$9$k$3$H$J$/L5;k$9$k!%$7$+$7%5%V%7%9%F(B -$B%`%a%s%F%J$OJQ99$r%l%S%e!<$7!$E,@Z$G$"$k$HH=CG$9$l$P:N$jF~$l$k!%3+H/<T$,(B -$BNI$$JQ99$r9T$($P9T$&$[$I!$%a%s%F%J$O3+H/<T$NH=CG$r?.MQ$7!$JQ99$r:N$jF~$l(B -$B$k$h$&$K$J$k$@$m$&!%3+H/<T$,CxL>$G!$(BLinus$B$,$$$^$@$K<u$1F~$l$F$$$J$$!$D94|(B -$B4V$K$o$?$k%V%i%s%A$N%a%s%F%J$G$"$k$J$i$P!$F1$86=L#$r;}$D?M!9$,H`$N:n6H$r(B -$B<h$j9~$`$?$a$KJQ99$rDj4|E*$K(Bpull$B$9$k$3$H$@$m$&!%(B +$BBhFs$K!$$3$l$OI>H=$H>N;?$K$h$k%7%9%F%`$G$"$k$H$$$&$3$H$@!%L5L>$N3+H/<T$N(B +$BJQ99$KBP$7$F$O(BLinus$B$O$*$=$i$/H?1~$9$k$3$H$J$/L5;k$9$k!%$7$+$7%5%V%7%9%F%`(B +$B%a%s%F%J$OJQ99$r%l%S%e!<$7!$E,@Z$G$"$k$HH=CG$9$l$P:N$jF~$l$k!%3+H/<T$,NI(B +$B$$JQ99$r9T$($P9T$&$[$I!$%a%s%F%J$O3+H/<T$NH=CG$r?.MQ$7!$JQ99$r:N$jF~$l$k(B +$B$h$&$K$J$k$@$m$&!%3+H/<T$,CxL>$G!$(BLinus$B$,$$$^$@$K<u$1F~$l$F$$$J$$!$D94|4V(B +$B$K$o$?$k%V%i%s%A$N%a%s%F%J$G$"$k$J$i$P!$F1$86=L#$r;}$D?M!9$,H`$N:n6H$r<h(B +$B$j9~$`$?$a$KJQ99$rDj4|E*$K(Bpull$B$9$k$3$H$@$m$&!%(B %Reputation and acclaim don't necessarily cross subsystem or ``people'' %boundaries. If you're a respected but specialised storage hacker, and @@ -702,10 +702,10 @@ %This can help you to quickly get acquainted with using commands on %network-hosted repositories. -Mercurial$B$N(B\hgcmd{serve}$B%3%^%s%I$r;H$C$F!$<j85$N%3%s%T%e!<%?$G%j%]%8%H%j(B -$B%5!<%S%9$r9T$&$N$O4JC1$G$"$k!%1sJ}$K$"$k%5!<%P$H$d$j$H$j$9$k$N$HF1MM$K(B -\hgcmd{clone}$B!$(B\hgcmd{incoming}$BEy$N%3%^%s%I$r;H$&$3$H$,$G$-$k!%$3$l$O%j%](B -$B%8%H%j$r%M%C%H%o!<%/$GDs6!$9$k$3$H$K47$l$k$N$KLrN)$D$@$m$&!%(B +Mercurial$B$N(B\hgcmd{serve}$B%3%^%s%I$r;H$C$F!$4JC1$K<j85$N%3%s%T%e!<%?$G%j%](B +$B%8%H%j%5!<%S%9$r9T$&$3$H$,$G$-$k!%1sJ}$K$"$k%5!<%P$H$d$j$H$j$9$k$N$HF1MM(B +$B$K(B\hgcmd{clone}$B!$(B\hgcmd{incoming}$BEy$N%3%^%s%I$r;H$&$3$H$,$G$-$k!%$3$l$O%M%C(B +$B%H%o!<%/$G%j%]%8%H%j$rDs6!$9$kN}=,$K$J$k$@$m$&!%(B %\subsection{A few things to keep in mind} \subsection{$B3P$($F$*$/$Y$-(B2, 3$B$NE@(B} @@ -973,7 +973,7 @@ $B%Q%9%U%l!<%:$r%(!<%8%'%s%H$K5-21$5$;$kJ@32$O!$%Q%o!<%5%$%/%k$r9T$C$F$b>l(B $B9g$K$h$C$F$O<~E~$J<jCJ$rMQ$$$k967b<T$K%Q%9%U%l!<%:$N%W%l!<%s%F%-%9%H>pJs(B -$B$r<hF@$5$l$k2DG=@-$,$"$k$3$H$G$"$k!%$3$N%j%9%/$,5vMF$GCe$kJ*2TF/$+$O<+J,(B +$B$r<hF@$5$l$k2DG=@-$,$"$k$3$H$G$"$k!%$3$N%j%9%/$,5vMF$G$-$k$+$I$&$+$O<+J,(B $B<+?H$GH=CG$7$FM_$7$$!%$3$NJ}K!$rMQ$$$k$3$H$G!$%?%$%W2s?t$r8:$i$;$k$3$H$O(B $B3N$+$G$"$k!%(B @@ -1287,8 +1287,8 @@ %Depending on how ambitious you are, configuring Mercurial's CGI %interface can take anything from a few moments to several hours. -$B$I$NDxEY$N$3$H$rA@$&$+$K$h$C$F!$(BMercurial$B$N(BCGI$B%$%s%?%U%'!<%9$N@_Dj$K$O?t(B -$BJ,$+$i?t;~4VDxEY$N;~4V$,$+$+$k!%(B +Mercurial$B$N(BCGI$B%$%s%?%U%'!<%9$N@_Dj$K$+$+$k;~4V$O!$L\E*$H$9$k$H$3$m$K1~$8(B +$B$F?tJ,$+$i?t;~4VDxEY$NI}$,$"$k!%(B %We'll begin with the simplest of examples, and work our way towards a %more complex configuration. Even for the most basic case, you're @@ -1442,7 +1442,7 @@ $BM3$,9M$($i$l!$<B:]!$$=$N$9$Y$F$K0z$C3]$+$C$F$$$k2DG=@-$,9b$$$N$G!$0J2<$N(B $B5-=R$rCm0U?<$/FI$s$GM_$7$$!%$3$3$K5s$2$?$N$O!$(BFedora~7$B$G!$?75,$K%$%s%9%H!<(B $B%k$5$l$?(BApache$B$H!$$3$NNcBj$N$?$a$K?75,$K:n@.$7$?%f!<%6%"%+%&%s%H$GI.<T$,(B -$B<B:]$K$GAx6x$7$?LdBj$G$"$k!%(B +$B<B:]$KAx6x$7$?LdBj$G$"$k!%(B %Your web server may have per-user directories disabled. If you're %using Apache, search your config file for a \texttt{UserDir} @@ -1518,8 +1518,8 @@ %of executing it, you may need to either uncomment (if already present) %or add a directive like this. Apache$B$,(BCGI$B%9%/%j%W%H$r<B9T$9$k$N$G$O$J$/!$%9%/%j%W%H<+BN$N%F%-%9%H$rAw$C(B -$B$F$/$k>l9g$O!$0J2<$N%G%#%l%/%F%#%V$rDI2C$9$k$+!$$9$G$KB8:_$7$F%3%a%s%H%"(B -$B%&%H$5$l$F$$$l$P!$%"%s%3%a%s%H$9$k!%(B +$B$F$/$k>l9g$O!$0J2<$N%G%#%l%/%F%#%V$rDI2C$9$k!%%G%#%l%/%F%#%V$,$9$G$K$"$j!$(B +$B%3%a%s%H%"%&%H$5$l$F$$$k$N$J$i!$M-8z2=$9$k!%(B \begin{codesample2} AddHandler cgi-script .cgi \end{codesample2} @@ -1853,7 +1853,7 @@ \item[\rcitem{web}{allowpull}] $B%V!<%kCM!%%j%b!<%H%f!<%6$K%&%'%V%$%s%?%U%'!<(B $B%9$rMQ$$$?(B~HTTP$B$K$h$k(B\hgcmd{pull}$B5Z$S(B\hgcmd{clone}$B$r5v2D$9(B $B$k$+$I$&$+$r7h$a$k!%(B\texttt{no}$B$^$?$O(B\texttt{false}$B$N>l9g!$(B - $B%&%'%V%$%s%?%U%'!<%9$O?M4V$N1\Mw$N$_$,2DG=$K$J$k!%(B + $B%&%'%V%$%s%?%U%'!<%9$O%V%i%&%6$K$h$k1\Mw$N$_$,2DG=$K$J$k!%(B %\item[\rcitem{web}{contact}] String. A free-form (but preferably % brief) string identifying the person or group in charge of the @@ -2066,7 +2066,7 @@ %stating that it does not trust their \filename{.hg/hgrc}. $B%7%9%F%`A4BN$N(B\filename{hgrc}$B%U%!%$%k$,M-MQ$J>l9g$N0lNc$K!$B>$N%f!<%6$,=j(B -$BM-?t(Br$B%j%]%8%H%j$+$i(Bpull$B$9$k>l9g$,$"$k!%%G%U%)%k%H$G$O(BMercurial$B$OJL$N%f!<(B +$BM-$9$k%j%]%8%H%j$+$i(Bpull$B$9$k>l9g$,$"$k!%%G%U%)%k%H$G$O(BMercurial$B$OJL$N%f!<(B $B%6$N=jM-$9$k%j%]%8%H%jFb$K$"$k(B\filename{.hg/hgrc}$B%U%!%$%k$N$[$H$s$I$N9`L\(B $B$r?.Mj$7$J$$!%$=$N$h$&$J%j%]%8%H%j$+$i%/%m!<%s$dJQ99$N(Bpull$B$r9T$&(B $B$H!$(BMercurial$B$O(B\filename{.hg/hgrc}$B$r?.Mj$7$J$$$H$$$&7Y9p$rI=<($9$k!%(B
--- a/ja/concepts.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/concepts.tex Sat Jul 11 19:25:35 2009 +0900 @@ -469,7 +469,7 @@ %purposes. Mercurial uses the parents of the dirstate as \emph{the % parents of a new changeset} when you perform a commit. -dirstate$B$O4IM}L\E*0U30$N>pJs$bJ]B8$7$F$$$k!%(B Mercurial$B$O!$%3%_%C%H$N:]$K(B +dirstate$B$O4IM}L\E*0J30$N>pJs$bJ]B8$7$F$$$k!%(B Mercurial$B$O!$%3%_%C%H$N:]$K(B dirstate$B$NN>?F$r(B\emph{$B?7$?$J%A%'%s%8%;%C%H$NN>?F(B}$B$H$7$FMQ$$$k!%(B \begin{figure}[ht] @@ -606,9 +606,9 @@ ``$B%(%i!<(B''$B$H$$$&8@MU$r0zMQId$G3g$C$?$N$O!$$3$N>uBV$O(B\hgcmd{merge}$B$H(B \hgcmd{commit}$B$@$1$G2r>C$G$-$k$+$i$@!%8@$$BX$($k$H!$$3$N>uBV$O$[$H$s$I$N(B -$B>l9g32$r$J$9$b$N$G$O$J$J$/!$C1$K=i?4<T$r6C$+$9DxEY$N$b$N$G$"$k!%$3$N?6Iq(B -$B$rHr$1$kJL$NJ}K!$d!$$J$<(BMercurial$B$,$3$N$h$&$K6C$+$;$k$h$&$JJ}K!$GF0:n$9$k(B -$B$N$+$K$D$$$F$O8e$[$I5DO@$9$k!%(B +$B>l9g32$r$J$9$b$N$G$O$J$/!$C1$K=i?4<T$r6C$+$9DxEY$N$b$N$G$"$k!%$3$N?6Iq$r(B +$BHr$1$kJL$NJ}K!$d!$$J$<(BMercurial$B$,$3$N$h$&$K6C$+$;$k$h$&$JJ}K!$GF0:n$9$k$N(B +$B$+$K$D$$$F$O8e$[$I5DO@$9$k!%(B \end{note} %\subsection{Merging changes @@ -684,8 +684,8 @@ $B>\$7$/=R$Y$l$P%^!<%8$K$O$$$m$$$m$JFC<lNc$,$"$k!%$7$+$7$3$3$G$O:G$bIaDL$N(B $BA*Br$K$D$$$F@bL@$9$k!%$3$l$^$G8+$F$-$?$h$&$K!$BgH>$N%1!<%9$O40A4$K<+F0$G(B -$B$"$j!$<B:]$KBgH>$N%^!<%8$O>WFM$r2r7h$9$k$?$a$KF~NO$r5a$a$k$3$H$J$/<+F0E*(B -$B$K40N;$9$k!%(B +$B$"$j!$<B:]$KBgH>$N%^!<%8$O%3%s%U%j%/%H$r2r7h$9$k$?$a$KF~NO$r5a$a$k$3$H$J(B +$B$/<+F0E*$K40N;$9$k!%(B %When you're thinking about what happens when you commit after a merge, %once again the working directory is ``the changeset I'm about to @@ -816,7 +816,7 @@ $B%k%4%j%:%`!J9-$/MQ$$$i$l$F$$$k05=L%Q%C%1!<%8$G$"$k(B\texttt{bzip2}$B$G;H$o$l(B $B$F$$$k(BBurrows-Wheeler$B%"%k%4%j%:%`!K$G:F05=L$9$k!%$3$N%"%k%4%j%:%`$H!$!J%j(B $B%S%8%g%sKh$G$J$/!K%9%H%j!<%`A4BN$r05=L$9$k$3$H$K$h$j!$Aw?.$5$l$k%P%$%H?t(B -$B$OBg$-$/Dc8:$5$l!$$"$i$f$k%M%C%H%o!<%/$G$h$$@-G=$r$($k$3$H$,$G$-$k!%(B +$B$OBg$-$/Dc8:$5$l!$$"$i$f$k%M%C%H%o!<%/$G$h$$@-G=$rF@$k$3$H$,$G$-$k!%(B %(If the connection is over \command{ssh}, Mercurial \emph{doesn't} %recompress the stream, because \command{ssh} can already do this @@ -914,7 +914,7 @@ $B$i$/BT$D!%$7$+$7%j%]%8%H%j$,D9;~4V$K$o$?$C$F%m%C%/$5$lB3$1$k>l9g$O!$=q$-(B $B9~$_$7$h$&$H$9$k%W%m%;%9$O%?%$%`%"%&%H$9$k!%$3$l$O!$Nc$($P!$F|>oMQ$$$k<+(B $BF0%9%/%j%W%H$O1J1s$K%9%?%C%/$9$k$o$1$G$O$J$$$3$H$r0UL#$9$k!%!J$b$A$m$s%?(B -$B%$%`%"%&%H$^$G$N;~4V$O%<%m$+$iL58B$N4V$G@_Dj$+$N$&$G$"$k!K(B +$B%$%`%"%&%H$^$G$N;~4V$O%<%m$+$iL58B$N4V$G@_Dj2DG=$G$"$k!K(B %\subsubsection{Safe dirstate access} \subsubsection{$B0BA4$J(Bdirstate$B%"%/%;%9(B} @@ -930,9 +930,9 @@ $B%j%S%8%g%s%G!<%?$N;~$HF1MM$K!$(BMercurial$B$O(Bdirstate$B%U%!%$%k$rFI$_=P$9:]$K$O(B $B%m%C%/$r9T$o$J$$!%%m%C%/$r9T$&$N$O=q$-9~$_$N;~$N$_$G$"$k!%0lIt$N$_$,=q$-(B $B9~$^$l$?(Bdirstate$B%U%!%$%k$rFI$_9~$^$J$$$h$&$K$9$k$?$a!$(B Mercurial$B$OF1$8%G%#(B -$B%l%/%H%jFb$K%f%K!<%/$JL>A0$G(Bdirstate$B%U%!%$%k$r=q$-!$$3$N0l;~%U%!%$%k$r%"(B -$B%H%_%C%/$K(B\filename{dirstate}$B$K%j%M!<%`$9$k!%$3$l$K$h(B -$B$j!$(B\filename{dirstate}$B%U%!%$%k$O>o$K40A4$G$"$k$3$H$,J]>Z$5$l$k!%(B +$B%l%/%H%jFb$K8GM-$JL>A0$G(Bdirstate$B%U%!%$%k$r=q$-!$$3$N0l;~%U%!%$%k$r%"%H%_%C(B +$B%/$K(B\filename{dirstate}$B$K%j%M!<%`$9$k!%$3$l$K$h$j!$(B\filename{dirstate}$B%U%!(B +$B%$%k$O>o$K40A4$G$"$k$3$H$,J]>Z$5$l$k!%(B %\subsection{Avoiding seeks} \subsection{$B%7!<%/$N2sHr(B} @@ -941,8 +941,8 @@ %disk head, since any seek is far more expensive than even a %comparatively large read operation. -Mercurial$B$N@-G=$K$O!$%G%#%9%/%X%C%I$N%7!<%/$rHr$1$k$3$H$,IT2D7g$G$"$k!%(B -$B%7!<%/$OBg5,LO$JFI$_=P$7A`:n$HHf3S$7$F$bHs>o$K9b$/$D$/!%(B +$B%G%#%9%/%X%C%I$N%7!<%/$rHr$1$k$3$H$O(BMercurial$B$N@-G=$K$H$C$F6K$a$F=EMW$G$"(B +$B$k!%%7!<%/$OBg5,LO$JFI$_=P$7A`:n$HHf3S$7$F$bHs>o$K9b2A$G$"$k!%(B %This is why, for example, the dirstate is stored in a single file. If %there were a dirstate file per directory that Mercurial tracked, the
--- a/ja/daily.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/daily.tex Sat Jul 11 19:25:35 2009 +0900 @@ -430,7 +430,7 @@ %this behavior is not appropriate to your specific case. $B2?$i$+$NM}M3$G$3$N$h$&$KJQ99$,<+F0E*$KGH5Z$9$k$d$jJ}$,9%$^$7$/$J$$$H;W$o(B -$B$l$k>l9g$O!$%7%9%F%`I8=`$N$"%U%!%$%k%3%T!<%3%^%s%I!J(BUNIX$B7O%7%9%F%`$G$O(B +$B$l$k>l9g$O!$%7%9%F%`I8=`$N%U%!%$%k%3%T!<%3%^%s%I!J(BUNIX$B7O%7%9%F%`$G$O(B \command{cp}$B!K$r;H$C$F%U%!%$%k$N%3%T!<$r9T$$!$(B\hgcmd{add}$B$G?7$7$$%3%T!<$r(B $B<jF0$GDI2C$9$k$3$H$,$G$-$k!%$3$l$r<B:]$K9T$&A0(B $B$K!$(B~\ref{sec:daily:why-copy}$B@a$r:FFI$7!$$3$N$d$jJ}$N>\:Y$rF'$^$($?>e$G!$(B @@ -587,7 +587,7 @@ $BJQ99$,%3%T!<$K=>$&5!G=$,M-MQ$G$"$k$3$H$O!$$*$=$i$/MF0W$KF10U$,F@$i$l$k$H(B $B$3$m$G$"$k$H;W$o$l$k!%$H$j$o$1%j%M!<%`$KDI=>$9$k5!G=$O$-$o$a$F=EMW$G$"$k(B $B$3$H$OL@Gr$G$"$k!%$b$7$3$N5!G=$,$J$1$l$P!$%U%!%$%k$N%j%M!<%`$K$h$C$FJQ99(B -$B$OMF0W$/9T$->l$r<:$C$F$7$^$&$@$m$&!%(B +$B$O$?$d$9$/9T$->l$r<:$C$F$7$^$&$@$m$&!%(B %\subsection{Divergent renames and merging} \subsection{$BL>A0$H%^!<%8$NH/;6(B} @@ -638,8 +638,8 @@ %guide it to a suitable resolution. 2$B?M$N%f!<%6$,0[$J$k(B\emph{$B%=!<%9(B}$B%U%!%$%k72$rF10l$N(B\emph{$BL\E*(B}$B%U%!%$%k$K%j(B -$B%M!<%`$9$k$H>WFM$,5/$-$k!%$3$N>l9g!$(BMercurial$B$ODL>o$N%^!<%85!9=$r5/F0$7!$(B -$B%f!<%6$KE,@Z$J2r7h$rB%$9!%(B +$B%M!<%`$9$k$H%3%s%U%j%/%H$,5/$-$k!%$3$N>l9g!$(BMercurial$B$ODL>o$N%^!<%85!9=$r(B +$B5/F0$7!$%f!<%6$KE,@Z$J2r7h$rB%$9!%(B %\subsection{Other name-related corner cases} \subsection{$BL>A0$K4XO"$7$?$$$/$D$+$NLdBj(B}
--- a/ja/filenames.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/filenames.tex Sat Jul 11 19:25:35 2009 +0900 @@ -22,8 +22,8 @@ %If you explicitly name real files on the command line, Mercurial works %with exactly those files, as you would expect. -$B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$O$=$l$i(B -$B$N%U%!%$%k$=$N$b$N$r07$&!%(B +$B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$OM?$($i(B +$B$l$?%U%!%$%k$@$1$r07$&!%(B \interaction{filenames.files} %When you provide a directory name, Mercurial will interpret this as @@ -66,10 +66,10 @@ % or pattern (see below). This protects you from accidentally % deleting files by running \hgcmd{remove} with no arguments, for % example. - \item $BI|85$,Fq$7$+$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:GDc(B - 1$B$D$NL>A0$d%Q%?!<%s$rM[$KMW5a$9$k!%!J2<5-$r;2>H!%!K$3$l$K$h$j!$Nc(B - $B$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$3$H$K$h$C$F8m$C$F%U%!%$%k$r(B - $B$9$Y$F>C$7$?$j$9$k$3$H$,$J$/$J$k!%(B + \item $BI|85$,:$Fq$G$"$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:G(B + $BDc(B1$B$D$NL>A0$d%Q%?!<%s$rL@<($9$k$3$H$r5a$a$k!J2<5-$r;2>H!%!K!%$3$&(B + $B$9$k$3$H$G!$Nc$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$?$a$K%U%!%$%k(B + $B$9$Y$F$r8m$C$F>C$9$3$H$,$J$/$J$k!%(B \end{itemize} %It's easy to work around these default behaviours if they don't suit @@ -87,27 +87,20 @@ %Along the same lines, some commands normally print file names relative %to the root of the repository, even if you're invoking them from a %subdirectory. Such a command will print file names relative to your - %subdirectory if you give it explicit names. Here, we're going to run - %\hgcmd{status} from a subdirectory, and get it to operate on the %entire working directory while printing file names relative to our - %subdirectory, by passing it the output of the \hgcmd{root} command. %\interaction{filenames.wdir-relname} -$B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%j%]%8%H%j$N%k!<%H$X$NAjBP%Q%9$G%U%!%$%kL>(B -$B$rI=<($9$k%3%^%s%I$b$"$k!%$=$N$h$&$J%3%^%s%I$G$O!$%5%V%G%#%l%/%H%j$NL>A0(B -$B$rL@<(E*$KM?$($k$H!$%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$rI=<($9$k$h$&$K$J$k!%(B - -$B$3$3$G$O%5%V%G%#%l%/%H%j$+$i(B\hgcmd{status}$B$r<B9T$9$k:]$K!$(B - - -$B$7$F!$(B -$B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%jA4BN$N%U%!%$%kL>$r%5%V%G%#%l%/%H%j$KBP$7$FAjBPE*$K(B -$BI=<($9$kMM$r8+$F$_$h$&!%(B - - +$B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%U%!%$%kL>$r%j%]%8%H%j$N%k!<%H$+$i$NAjBP%Q(B +$B%9$GI=<($9$k%3%^%s%I$,$"$k!%$=$N$h$&$J%3%^%s%I$KL@<(E*$K%5%V%G%#%l%/%H%j(B +$BL>$rM?$($k$H!$8=:_$N%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$,I=<($5$l$k!%$3$3$G!$(B +$B%5%V%G%#%l%/%H%jFb$+$i(B\hgcmd{status}$B%3%^%s%I$K(B\hgcmd{root}$B%3%^%s%I$N=PNO(B +$B$r0z?t$H$7$FM?$($F5/F0$7!$(B \hgcmd{status}$B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%j(B +$BFb$N%U%!%$%k$r8=:_$N%5%V%G%#%l%/%H%j$KBP$9$kAjBP%Q%9$GI=<($9$kMM;R$r8+$F(B +$B$_$h$&!%(B +\interaction{filenames.wdir-relname} %\section{Telling you what's going on} @@ -593,7 +586,8 @@ $B$A$OLdBj$H$J$i$J$$!%$7$+$7%o!<%-%s%0%G%#%l%/%H%j$r$=$N%A%'%s%8%;%C%H$K(B \hgcmd{update}$B$7$h$&$H$7$?$j!$$=$N%A%'%s%8%;%C%H$H(B\hgcmd{merge}$B$7$h$&$H$9(B $B$k$H!$(BMercurial$B$O!$(B 2$B$D$N%U%!%$%kL>$r%U%!%$%k%7%9%F%`$,F1$8L>A0$H$7$F07$&(B -$B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B update$B$d(Bmerge$B$r5v$5$J$$!%(B +$B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B \hgcmd{update}$B$d(B\hgcmd{merge}$B$r5v$5$J(B +$B$$!%(B %\subsection{Fixing a case conflict} \subsection{$BBgJ8;z>.J8;z$N>WFM$r2r7h$9$k(B} @@ -627,7 +621,7 @@ %you can continue development unimpeded. $BBg>.J8;z$N%U%!%$%kL>%3%s%U%j%/%H$,$"$k%A%'%s%8%;%C%H$O%W%m%8%'%/%H$NMzNr(B -$B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B$7$9$F$`$G$O$=$N%A%'%s%8%;%C%H$X(B +$B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B%7%9%F%`$G$O$=$N%A%'%s%8%;%C%H$X(B \hgcmd{update}$B$9$k$3$H$O$G$-$J$$$b$N$N!$LdBj$J$/3+H/$rB3$1$k$3$H$,$G$-$k!%(B
--- a/ja/hgext.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/hgext.tex Sat Jul 11 19:25:35 2009 +0900 @@ -191,8 +191,8 @@ %extensions. But the performance improvement is worth it! 2007$BG/(B5$B7n$^$G$O(B\hgext{inotify}$B3HD%$O(BMercurial$B$KF1:-$5$l$F$$$J$+$C$?!%$=$N(B -$B$?$a!$%;%C%H%"%C%W$OB>$N3HD%$KHf$Y$F$d$dJ#;($@$,!$F@$i$l$k@-G=8~>e$O$K$O(B -$B$=$l$@$1$N2ACM$,$"$k!%(B +$B$?$a!$%;%C%H%"%C%W$OB>$N3HD%$KHf$Y$F$d$dJ#;($@$,!$F@$i$l$k@-G=8~>e$K$O$=(B +$B$l$@$1$N2ACM$,$"$k!%(B %The extension currently comes in two parts: a set of patches to the %Mercurial source code, and a library of Python bindings to the
--- a/ja/hook.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/hook.tex Sat Jul 11 19:25:35 2009 +0900 @@ -318,8 +318,8 @@ Mercurial$B$O%G!<%?$NFI$_=q$-$N=g=x$rCm0U?<$/9T$&$?$a!$%j%]%8%H%j$+$i$N%G!<(B $B%?FI$_=P$7$N:]$K%m%C%/$r<hF@$9$kI,MW$,$J$$!%(B Mercurial$B$N%j%]%8%H%j$+$iFI(B -$B$_=P$7$r9T$&ItJ,$O!$%m%C%/$rA4$/5$$K$9$kI,MW$,$J$$!%$3$NL5%m%C%/FI$_=P$7(B -$B$K$h$C$F!$F1;~<B9T@-$H@-G=$rBgI}$K9b$a$F$$$k!%(B +$B$_=P$7$r9T$&ItJ,$O!$%m%C%/$rA4$/5$$K$9$kI,MW$,$J$$!%$3$N%m%C%/$J$7FI$_=P(B +$B$7$K$h$C$F!$F1;~<B9T@-$H@-G=$rBgI}$K9b$a$F$$$k!%(B %With great performance comes a trade-off, though, one which has the %potential to cause you trouble unless you're aware of it. To describe @@ -1100,7 +1100,7 @@ \hgext{acl}$B%U%C%/$r%F%9%H$7$?$$>l9g$O!$(BMercurial$B$N%G%P%C%0=PNO$rM-8z$K$7(B $B$F<B9T$9$k$HNI$$!%%5!<%P>e$G<B9T$9$k$N$G$"$l$P!"(B\hggopt{--debug}$B%*%W%7%g(B $B%s$rEO$9$N$OITJX$G$"$C$?$j!"IT2DG=$G$"$C$?$j$9$k$3$H$,$"$k!#$3$N$?$a!"%G(B -$B%P%C%0=PNO$O(B \hgrc $B$G$($bM-8z$K$G$-$k$3$H$r5-21$7$F$*$/$Y$-$G$"$k!%(B +$B%P%C%0=PNO$O(B \hgrc $B$G$bM-8z$K$G$-$k$3$H$r5-21$7$F$*$/$Y$-$G$"$k!%(B \begin{codesample2} [ui] debug = true @@ -1316,9 +1316,9 @@ %section. $B%G%U%)%k%H$G$O(B\hgext{bugzilla}$B%U%C%/$O%P%0$r99?7$9$k(BBugzilla$B%f!<%6L>$H$7(B -$B$F%A%'%s%8%;%C%H$N%3%_%C%?$N(Bemail$B%"%I%l%9$r;H$*$&$H$9$k!%(B -$B$3$N5sF0$,K>$^$7$/$J$$>l9g$O!$(B\rcsection{usermap}$B%;%/%7%g%s$r$;$C$F$$$9$k(B -$B$3$H$G%3%_%C%?$N(Bemail$B%"%I%l%9$r(BBugzilla$B$N%f!<%6L>$K%^%C%W$9$k$3$H$,$G$-$k!%(B +$B$F%A%'%s%8%;%C%H$N%3%_%C%?$N(Bemail$B%"%I%l%9$r;H$*$&$H$9$k!%$3$N5sF0$,K>$^$7(B +$B$/$J$$>l9g$O!$(B\rcsection{usermap}$B%;%/%7%g%s$r@_Dj$9$k$3$H$G%3%_%C%?$N(B +email$B%"%I%l%9$r(BBugzilla$B$N%f!<%6L>$K%^%C%W$9$k$3$H$,$G$-$k!%(B %Each item in the \rcsection{usermap} section contains an email address %on the left, and a Bugzilla user name on the right. @@ -1820,7 +1820,7 @@ %parameter is ``\texttt{node}'', the name of the environment variable %representing that parameter will be ``\texttt{HG\_NODE}''. -$B%U%C%/%Q%i%a!<%?$O%U%C%/$K4D6-JS%9%H$7$FEO$5$l$k!%3F!9$N4D6-JQ?tL>$OBgJ8(B +$B%U%C%/%Q%i%a!<%?$O%U%C%/$K4D6-JQ?t$H$7$FEO$5$l$k!%3F!9$N4D6-JQ?tL>$OBgJ8(B $B;z$KJQ49$5$l!$@\F,<-(B``\texttt{HG\_}''$B$,IU$1$i$l$k!%Nc$($P(B ``\texttt{node}''$B$H$$$&%Q%i%a!<%?$,;H$o$l$?$H$9$k$H!$$3$N%Q%i%a!<%?$rI=(B $B$94D6-JQ?tL>$O(B``\texttt{HG\_NODE}''$B$H$J$k!%(B @@ -2178,7 +2178,7 @@ %push to it, while still allowing a local administrator to modify the %repository. -$B$3$N%U%C%/$r;H$C$F!$30It$NJQ99$,%j%]%8%H%j$K$D$$$+$5$l$J$$$h$&$K$9$k$3$H(B +$B$3$N%U%C%/$r;H$C$F!$30It$NJQ99$,%j%]%8%H%j$KDI2C$5$l$J$$$h$&$K$9$k$3$H(B $B$b$G$-$k!%Nc$($P!$$3$N%U%C%/$r%5!<%P$GDs6!$5$l$k%V%i%s%A$r0l;~E*$^$?$O1J(B $BB3E*$K(B``$BE`7k(B''$B$7!$%m!<%+%k$J4IM}<T$O%j%]%8%H%j$rJQ99$G$-$k$,!$%j%b!<%H(B $B%f!<%6$O$=$N%j%]%8%H%j$K(Bpush$B$G$-$J$$$h$&$K$G$-$k!%(B @@ -2312,9 +2312,10 @@ %\end{itemize} \begin{itemize} -\item[\texttt{local}] $B%V!<%kCM!%?7$7$$%?%0$,%j%]%8%H%j%m!<%+%k$J$b$N(B - (\sfilename{.hg/localtags}$B$KJ]B8$5$l$k(B)$B$+(BMercurial$B$K4IM}(B - $B$5$l$k$b$N(B(\sfilename{.hgtags}$B$KJ]B8$5$l$k(B)$B$+$r<($9!%(B +\item[\texttt{local}] $B%V!<%kCM!%?7$7$$%?%0$,8=:_$N%j%]%8%H%j$K%m!<%+%k$J(B + $B$b$N(B(\sfilename{.hg/localtags}$B$KJ]B8$5$l$k(B)$B$+(BMercurial$B$G%0%m!<(B + $B%P%k$K4IM}$5$l$k$b$N(B(\sfilename{.hgtags}$B$KJ]B8$5$l$k(B)$B$+$r<((B + $B$9!%(B \item[\texttt{node}] $B%A%'%s%8%;%C%H(BID$B!%%?%0IU$1$5$l$k%A%'%s%8%;%C%H$N(BID. \item[\texttt{tag}] $BJ8;zNs!%@8@.$5$l$?%?%0$NL>A0!%(B \end{itemize} @@ -2524,9 +2525,10 @@ $B$3$N%U%C%/$X$N%Q%i%a!<%?!'(B \begin{itemize} -\item[\texttt{local}] $B%V!<%kCM!%?7$7$$%?%0$,%j%]%8%H%j%m!<%+%k$J$b$N(B - (\sfilename{.hg/localtags}$B$KJ]B8$5$l$k(B)$B$+(BMercurial$B$K4IM}(B - $B$5$l$k$b$N(B(\sfilename{.hgtags}$B$KJ]B8$5$l$k(B)$B$+$r<($9!%(B +\item[\texttt{local}] $B%V!<%kCM!%?7$7$$%?%0$,8=:_$N%j%]%8%H%j$K%m!<%+%k$J(B + $B$b$N(B(\sfilename{.hg/localtags}$B$KJ]B8$5$l$k(B)$B$+(BMercurial$B$K%0%m!<(B + $B%P%k$K4IM}$5$l$k$b$N(B(\sfilename{.hgtags}$B$KJ]B8$5$l$k(B)$B$+$r<((B + $B$9!%(B \item[\texttt{node}] $B%A%'%s%8%;%C%H(BID$B!%%?%0IU$1$5$l$k%A%'%s%8%;%C%H$N(BID. \item[\texttt{tag}] $BJ8;zNs!%@8@.$5$l$?%?%0$NL>A0!%(B \end{itemize}
--- a/ja/intro.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/intro.tex Sat Jul 11 19:25:35 2009 +0900 @@ -11,10 +11,9 @@ %new name that contains a number, each one higher than the number of %the preceding version. -$B%j%S%8%g%s%3%s%H%m!<%k$H$O!$J#?t$N%P!<%8%g%s$N>pJs$r$r4IM}$9$k%W%m%;%9$G(B -$B$"$k!%:G$bC1=c$JJ}K!$O!$%U%!%$%k$rJQ99$7$?$i!$$=$l$^$G$N%P!<%8%g%s$h$j$b(B -$BBg$-$J?t;z$r4^$`?7$?$JL>A0$G%;!<%V$r9T$&$J$I$NJ}K!$GA4$F<j$G9T$&$3$H$G$"(B -$B$k!%(B +$B%j%S%8%g%s%3%s%H%m!<%k$H$O!$J#?t$N%P!<%8%g%s$N>pJs$r4IM}$9$k%W%m%;%9$G$"(B +$B$k!%:G$bC1=c$JJ}K!$O!$%U%!%$%k$rJQ99$7$?$i!$$=$l$^$G$N%P!<%8%g%s$h$j$bBg(B +$B$-$J?t;z$r4^$`?7$?$JL>A0$G%;!<%V$r9T$&$J$I$NJ}K!$GA4$F<j$G9T$&$3$H$G$"$k!%(B %Manually managing multiple versions of even a single file is an %error-prone task, though, so software tools to help automate this @@ -54,9 +53,9 @@ % makes it easier for you to collaborate. For example, when people % more or less simultaneously make potentially incompatible changes, % the software will help you to identify and resolve those conflicts. - \item $BB>$N?M$H:n6H$7$F$$$k;~!$%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$O6&F1(B - $B:n6H$r=u$1$k!%Nc$($P!$?M!9$,F1;~$K8_49@-$N$J$$JQ99$r9T$C$?>l9g!$(B - $B%=%U%H%&%'%"$O%3%s%U%j%/%H$rFCDj$7!$2D7h$9$k$3$H$r=u$1$k!%(B + \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$OB>$N?M$H$N6&F1:n6H$r=u$1$k!%Nc(B + $B$($P!$J#?t$N%f!<%6$,F1;~$K8_49@-$N$J$$JQ99$r9T$C$?>l9g!$%=%U%H%&%'(B + $B%"$N;Y1g$G%3%s%U%j%/%H$rFCDj$72r7h$9$k$3$H$,$G$-$k!%(B %\item It can help you to recover from mistakes. If you make a change % that later turns out to be in error, you can revert to an earlier % version of one or more files. In fact, a \emph{really} good @@ -84,10 +83,10 @@ %\emph{benefits} compare to its \emph{costs}. A revision control tool %that's difficult to understand or use is going to impose a high cost. -$B%j%S%8%g%s%3%s%H%m!<%k$N<BMQ@-$K4X$9$k80$K$J$k<ALd$O!$$3$l$i$N(B2$B$D$N0[$J$C(B -$B$?%9%1!<%k!J(B``$B0l?M$N%O%C%+!<(B''$B%l%Y%k$+$i(B``$BBg5,LO%A!<%`(B''$B%l%Y%k$^$G!K$K$*(B -$B$$$F!$%3%9%H$KBP$7$F$I$l$@$1Mx1W$,$"$k$N$+$H$$$&$3$H$G$"$k!%M}2r$d;HMQ$,(B -$B:$Fq$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O9b$$%3%9%H$r2!$7$D$1$k!%(B +$B%j%S%8%g%s%3%s%H%m!<%k$,<BMQE*$G$"$k$+$I$&$+H=CG$9$k80$O!$$5$^$6$^$J3+H/(B +$B%9%1!<%k!J(B``1$B?M$N%O%C%+!<(B''$B%l%Y%k$+$i(B``$BBg5,LO%A!<%`(B''$B%l%Y%k$^$G!K$K$*$$(B +$B$F!$;YJ'$&%3%9%H$KBP$7$F$I$l$@$18zG=$,F@$i$l$k$+$H$$$&$3$H$G$"$k!%M}2r$d(B +$B;HMQ$,:$Fq$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O9b$$%3%9%H$r2]$9$3$H$K$J$k!%(B %A five-hundred-person project is likely to collapse under its own %weight almost immediately without a revision control tool and process. @@ -96,9 +95,8 @@ %guaranteed. 500$B?M$+$i$J$k%W%m%8%'%/%H$G$O!$%j%S%8%g%s%3%s%H%m!<%k%D!<%k$J$7$G$OKX$s$I(B -$BN)$A9T$+$J$$!%$3$N>l9g!$%j%S%8%g%s%3%s%H%m!<%k$J$7$G$O<:GT$9$k$3$H$,KX$s(B -$B$IL@Gr$J$?$a!$%j%S%8%g%s%3%s%H%m!<%k$r9T$&%3%9%H$rJ'$&$3$H$OFC$KLdBj$H$O(B -$B$J$i$J$$!%(B%xxx +$BN)$A9T$+$J$$!%$3$N>l9g!$%j%S%8%g%s%3%s%H%m!<%k$J$7$G$OL@$i$+$K<:GT$9$k$?(B +$B$a!$%j%S%8%g%s%3%s%H%m!<%k$r9T$&%3%9%H$OFC$KLdBj$H$O$J$i$J$$!%(B%xxx %On the other hand, a one-person ``quick hack'' might seem like a poor %place to use a revision control tool, because surely the cost of using @@ -243,12 +241,13 @@ %``pain level'' of fixing these architectural problems prohibitive. 1990$BG/BeCf:"$K$J$k$H!$(BCVS$B$NLdBj$,9-$/CN$i$l$k$h$&$K$J$C$F$-$?!%(B CVS$B$O0lEY(B -$B$KJ#?t$N%U%!%$%k$KBP$7$F9T$o$l$kJQ99$rO@M}E*$K%"%H%_%C%/$JA`:n$H$7$F%0%k!<(B -$B%W2=$9$k$N$G$O$J$/!$%U%!%$%kKh$K8DJL$K5-O?$7$F$$$?!%(BCVS$B$N%U%!%$%k%R%(%i%k(B -$B%-!<$N4IM}$OIT==J,$G!$%U%!%$%k$d%G%#%l%/%H%j$r%j%M!<%`$9$k$H4JC1$K%j%]%8(B -$B%H%j$,:.Mp$7$?!%$5$i$K0-$$$3$H$K!$(BCVS$B$N%=!<%9%3!<%I$OFI$_$K$/$/!$%a%s%F%J(B -$B%s%9$bFq$7$+$C$?$?$a!$%"!<%-%F%/%A%c$NLdBj$r2r7h$9$k$N$OIT2DG=$J%l%Y%k$H(B -$B8@$($?!%(B +$B$KJ#?t$N%U%!%$%k$KBP$7$F9T$o$l$kJQ99$rO@M}E*$K%"%H%_%C%/$JA`:n(B +\footnote{$BLuCm!'$"$?$+$b86;R$N$h$&$K!$J#?t$NMWAG$KJ,2r$G$-$J$$A`:n$r8@$&(B}$B$H(B +$B$7$F%0%k!<%W2=$9$k$N$G$O$J$/!$%U%!%$%kKh$K8DJL$K5-O?$7$F$$$?!%(BCVS$B$N%U%!%$(B +$B%k%R%(%i%k%-!<$N4IM}$OIT==J,$G!$%U%!%$%k$d%G%#%l%/%H%j$r%j%M!<%`$9$k$H4J(B +$BC1$K%j%]%8%H%j$,:.Mp$7$?!%$5$i$K0-$$$3$H$K!$(BCVS$B$N%=!<%9%3!<%I$OFI$_$K$/(B +$B$/!$%a%s%F%J%s%9$bFq$7$+$C$?$?$a!$%"!<%-%F%/%A%c$NLdBj$r2r7h$9$k$N$OIT2D(B +$BG=$J%l%Y%k$H8@$($?!%(B %In 2001, Jim Blandy and Karl Fogel, two developers who had worked on %CVS, started a project to replace it with a tool that would have a @@ -322,12 +321,12 @@ $BBhFs@$Be$N%D!<%k$O!$%M%C%H%o!<%/Cf?4$N%"!<%-%F%/%A%c$K0\9T$9$k$3$H$G!$$=(B $B$l$^$G$N@)8B$r4KOB$7!$%W%m%8%'%/%HA4BN$rF1;~$K4IM}$7$?!%%W%m%8%'%/%H$,Bg(B -$B$-$/@.D9$9$k$H!$?7$?$JLdBj$KD>LL$7$?!%%/%i%$%"%s%H$,%5!<%P$KIQHK$KDL?.$9(B +$B$-$/@.D9$9$k$H!$?7$?$JLdBj$KD>LL$7$?!%%/%i%$%"%s%H$H%5!<%P$,IQHK$KDL?.$9(B $B$k$?$a!$Bg5,LO%W%m%8%'%/%H$G$O%5!<%P$N5,LO$,LdBj$K$J$C$?!%?.Mj@-$N$J$$%M%C(B $B%H%o!<%/@\B3$O%j%b!<%H%f!<%6$,%5!<%P$HDL?.$9$k$N$rK8$2$?!%%*!<%W%s%=!<%9(B $B%W%m%8%'%/%H$,%3%_%C%H8"$N$J$$%f!<%6$K$bF?L>$NFI$_=P$7@lMQ%"%/%;%9$rDs6!(B -$B$9$k$h$&$K$J$k$H!$%D!<%k$OH`$i$N9T$C$?JQ99$r5-O?$G$-$J$$$?$a!$%W%m%8%'%/(B -$B%H$H$d$j$H$j$r9T$&<+A3$J<jCJ$H$O8@$($J$$$3$H$,$o$+$C$?!%(B +$B$9$k$h$&$K$J$k$H!$%f!<%6$i$O$3$l$i$N%D!<%k$,9T$C$?JQ99$r5-O?$G$-$:!$%W%m(B +$B%8%'%/%H$H$N$d$j$H$j$,ITJX$G$"$k$3$H$KITK~$rJg$i$;$F$$$C$?!%(B %The current generation of revision control tools is peer-to-peer in %nature. All of these systems have dropped the dependency on a single @@ -403,12 +402,12 @@ %you have a far-flung team of collaborators, this may be significant. $BJ,;6%D!<%k$G$O!$%M%C%H%o!<%/$N?.Mj@-$NM?$($k1F6A$O=8Cf%D!<%k$KHf$Y$FMZ$+(B -$B$K>.$5$$!%=8Cf%D!<%k$O!$$$$/$D$+$NBg$-$J@)8B$N$"$k%3%^%s%I$r=|$$$F%M%C%H(B -$B%o!<%/@\B3$J$7$K;HMQ$G$-$J$$!%J,;6%D!<%k$G$O:n6HCf$K%M%C%H%o!<%/@\B3$,CG(B -$B$?$l$?$H$7$F$b$=$l$K5$$E$/$3$H$9$i$J$$$@$m$&!%B>$N%3%s%T%e!<%?$N%j%]%8%H(B -$B%j$H$NDL?.$r9T$&F0:n$N$_$,1F6A$r<u$1$k!%$3$N$h$&$JF0:n$O%m!<%+%k$G$NF0:n(B -$B$h$jAjBPE*$K>/$J$$$O$:$@!%$3$l$,=EBg$JLdBj$H$J$k$N$O!$9-HO0O$K$o$?$k%A!<(B -$B%`$G:n6H$r$7$F$$$k>l9g$G$"$m$&!%(B +$B$K>.$5$$!%=8Cf%D!<%k$O!$%M%C%H%o!<%/$K@\B3$7$J$1$l$P!$Bg$-$J@)8B$N$"$k$$(B +$B$/$D$+$N%3%^%s%I0J30$O;HMQ$G$-$J$$!%J,;6%D!<%k$G$O:n6HCf$K%M%C%H%o!<%/@\(B +$BB3$,CG$?$l$?$H$7$F$b$=$l$K5$$E$/$3$H$9$i$J$$$@$m$&!%B>$N%3%s%T%e!<%?$N%j(B +$B%]%8%H%j$H$NDL?.$r9T$&F0:n$N$_$,1F6A$r<u$1$k!%$3$N$h$&$JF0:n$O%m!<%+%k$G(B +$B$NF0:n$h$jAjBPE*$K>/$J$$$O$:$@!%$3$l$,=EBg$JLdBj$H$J$k$N$O!$9-HO0O$K$o$?(B +$B$k%A!<%`$G:n6H$r$7$F$$$k>l9g$G$"$m$&!%(B %\subsection{Advantages for open source projects} \subsection{$B%*!<%W%s%=!<%9%W%m%8%'%/%H$G$NMxE@(B} @@ -464,7 +463,7 @@ $BCf%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$G$O!$:90[$r(B\emph{$B5;=QE*$K(B}$B2r7h$9$k2aDx$K(B $B:$Fq$rH<$$!$B?$/$N>l9g!$<jF0$G2r>C$9$kI,MW$,$"$k!%$I$N%j%S%8%g%sMzNr$r;D(B $B$9$N$+7h$a!$$[$+$N%A!<%`$K$h$kJQ99$r%D%j!<$X$J$s$i$+$NJ}K!$G7Q$.LZ$9$kI,(B -$BMW$,$"$k!%$3$NA`:n$G$O!$DL>o!$0lJ}$N%j%S%8%g%sMzNr$N0lIt$^$?$OA4BN$r<:$&(B +$BMW$,$"$k!%$3$NA`:n$G$O!$DL>o!$0lJ}$N%j%S%8%g%sMzNr$N0lIt$^$?$OA4$F$r<:$&(B $B$3$H$K$J$k!%(B %What distributed tools do with respect to forking is they make forking @@ -491,7 +490,7 @@ %to as a ``fork'' becomes \emph{purely} a social issue. If anything, %distributed tools \emph{lower} the likelihood of a fork: -$B3F?M$,>o$K9T$&:n6H$NCGJR$,%U%)!<%/$H%^!<%8$K0LCVIU$1$i$l$k$J$i$P!$%*!<%W(B +$B3F?M$,9T$&A4$F$NItJ,:n6H$,%U%)!<%/$H%^!<%8$K0LCVIU$1$i$l$k$J$i$P!$%*!<%W(B $B%s%=!<%93&$O(B``$B%U%)!<%/(B''$B$r(B\emph{$B=c?h$K(B}$B<R2qE*$J;v>]$H$7$F07$&$@$m$&!%$$$:(B $B$l$K$;$hJ,;6%D!<%k$O%U%)!<%/$N38A3@-$r(B\emph{$B2<$2$k(B}$B!'(B @@ -506,8 +505,9 @@ \begin{itemize} \item $BCf1{=8CfE*$J%D!<%k$,2]$9!$%3%_%C%H8"$r;}$C$?FbIt$N?M4V$H;}$?$J$$30(B $BIt$N?M4V$N<R2qE*$J6hJL$r<h$j5n$k(B - \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$N4QE@$+$i$9$k$H!$F1$8%^!<%8$G$"(B - $B$k$?$a!$<R2qE*$J%U%)!<%/$N8e$K:90[$r2r>C$9$k$N$rMF0W$K$9$k!%(B + \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$N4QE@$+$i$OF1$8%^!<%8$G$"$k$?(B + $B$a!$3+H/%3%_%e%K%F%#$N%U%)!<%/8e$K@8$8$?:90[$r2r>C$9$k$N$,MF0W$K$J(B + $B$k!%(B \end{itemize} @@ -926,8 +926,8 @@ Perforce$B$N@-G=$O!$>.5,LO$J%A!<%`$G$N:n6H$K$*$$$F$O$+$J$jNI$$!%$7$+$7%f!<(B $B%6?t$,?t%@!<%90J>e$KA}2C$9$k$K=>$C$F!$5^7c$K0-$/$J$C$F$$$/!%$+$J$jBg5,LO(B -$B$J(BPerforce$B4D6-$G$O!$%f!<%6$NA`:n$K$h$kIi2Y$r7Z8:$9$k$?$a$N%W%m%-%7!<$,I,(B -$BMW$K$J$k!%(B +$B$J(BPerforce$B4D6-$G$O!$%f!<%6$NA`:n$K$h$kIi2Y$r7Z8:$9$k$?$a$N%W%m%-%7$,I,MW(B +$B$K$J$k!%(B %\subsection{Choosing a revision control tool} \subsection{$B%j%S%8%g%s%3%s%H%m!<%k%D!<%k$rA*$V(B}
--- a/ja/mq-collab.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/mq-collab.tex Sat Jul 11 19:25:35 2009 +0900 @@ -19,7 +19,7 @@ $B$3$N>O$G$O!$(BLinux$B%+!<%M%kMQ(BInfiniband$B%G%P%$%9%I%i%$%P$N3+H/$r4IM}$9$k$N$K(B $BMQ$$$?%F%/%K%C%/$rNc$H$7$FMQ$$$k!%$3$N%I%i%$%P$O!J%I%i%$%P$H$7$F$O!KBg5,(B $BLO$G!$(B35$B$N%=!<%9%U%!%$%k$K$o$?$k(B25000$B9T$+$i$J$k!%$3$N%=!<%9$O>.5,LO$J3+H/(B -$B<T$N%A!<%`$K$h$C$F$$;~4IM}$5$l$F$$$k!%(B +$B<T$N%A!<%`$K$h$C$F0];}4IM}$5$l$F$$$k!%(B %While much of the material in this chapter is specific to Linux, the %same principles apply to any code base for which you're not the @@ -163,13 +163,12 @@ %This gives us a tiny repository that contains two patches that don't %have any dependencies on each other, because they touch different files. -$BB?$/$N%?!<%2%C%H$rBP>]$H$7$J$,$i@5>o$KJ]$D0lHVNI$$J}J}$O!$>u67$K1~$8$FFC(B +$BB?$/$N%?!<%2%C%H$rBP>]$H$7$J$,$i@5>o$KJ]$D0lHVNI$$J}K!$O!$>u67$K1~$8$FFC(B $BDj$N%Q%C%A$rA*$Y$k$h$&$K$9$k$3$H$G$"$k!%(BMQ$B$O$3$NL\E*$N$?$a$K(Bquilt$B$N(B \texttt{guards}$B%3%^%s%I$KN`;w$7$?(B``guards''$B$H8F$P$l$k5!G=$rDs6!$7$F$$$k!%(B $B3+;O$KEv$?$C$F!$<B83$N$?$a$KC1=c$J%j%]%8%H%j$r:n@.$9$k!%(B -\interaction{mq.guards.init} -$B>.$5$J%j%]%8%H%j$r:n$j!$JL!9$N%U%!%$%k$rA`:n$9$k8_$$$K0MB8@-$N$J$$(B2$B$D$N%Q%C(B -$B%A$rCV$/!%(B +\interaction{mq.guards.init}$B>.$5$J%j%]%8%H%j$r:n$j!$JL!9$N%U%!%$%k$rA`:n(B +$B$9$k8_$$$K0MB8@-$N$J$$(B2$B$D$N%Q%C%A$rCV$/!%(B %The idea behind conditional application is that you can ``tag'' a %patch with a \emph{guard}, which is simply a text string of your @@ -177,11 +176,10 @@ %patches. MQ will then either apply, or skip over, a guarded patch, %depending on the guards that you have selected. -$B>r7oIU$-$G%Q%C%A%Q%C%A$NE,MQ$r%3%s%H%m!<%k$9$kJ}K!$NGX8e$K$"$k$N(B -$B$O!$(B\emph{guard}$B$K$h$C$F%Q%C%A$KIU$1$i$l$?(B``$B%?%0(B''$B$G$"$k!%%?%0$O<+M3$KA*(B -$B$s$@C1=c$J%F%-%9%H$G!$(BMQ$B$,%Q%C%A$rE,MQ$9$k$H$-$KMQ$$$kFCDj$N%,!<%I$r;XDj(B -$B$9$k!%(BMQ$B$O%,!<%I%Q%C%A$NE,MQ$^$?$O%9%-%C%W$r!$;XDj$5$l$?%,!<%I$K$h$C$F7h(B -$BDj$9$k!%(B +$B>r7oIU$-$G%Q%C%A$NE,MQ$r@)8f$9$kJ}K!$G$O!$(B\emph{guard}$B$K$h$C$F%Q%C%A$KIU(B +$B$1$i$l$?(B``$B%?%0(B''$B$r3hMQ$9$k!%%?%0$O<+M3$KA*$s$@C1=c$J%F%-%9%H$G!$(BMQ$B$,%Q%C(B +$B%A$rE,MQ$9$k$H$-$KMQ$$$kFCDj$N%,!<%I$r;XDj$9$k!%(BMQ$B$O%,!<%I%Q%C%A$NE,MQ$^(B +$B$?$O%9%-%C%W$r!$;XDj$5$l$?%,!<%I$K$h$C$F7hDj$9$k!%(B %A patch can have an arbitrary number of guards; %each one is \emph{positive} (``apply this patch if this guard is
--- a/ja/mq-ref.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/mq-ref.tex Sat Jul 11 19:25:35 2009 +0900 @@ -224,7 +224,7 @@ % added to the newly created patch, so after this command completes, % the working directory will no longer be modified. \item[\hgxopt{mq}{qnew}{-f}] $B%+%l%s%H%G%#%l%/%H%j$NFbMF$,99?7$5$l$F$$$k(B - $B>l9g!$?7$7$$%Q%C%A$r:n@.$9$k!%8IN)$7$?JQ2&(B + $B>l9g!$?7$7$$%Q%C%A$r:n@.$9$k!%8IN)$7$?JQ99(B $B$O?75,$K:n@.$7$?%Q%C%A$KDI2C$5$l!$$3$N%3%^(B $B%s%I$,=*N;$9$k$H%o!<%-%s%0%G%#%l%/%H%j$OJQ(B $B99$J$7$N>uBV$K$J$k!%(B
--- a/ja/mq.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/mq.tex Sat Jul 11 19:25:35 2009 +0900 @@ -179,8 +179,8 @@ %Quilt knows nothing about revision control tools, so it works equally %well on top of an unpacked tarball or a Subversion working copy. -quilt$B$O%j%S%8%g%s4IM}%D!<%k$K$D$$$F$OA4$/4XCN$7$J$$$?$a!$E83+$5$l$?(Btar$B%\!<(B -$B%k>e$G$b!$(BSubversion$B$N%o!<%-%s%0%3%T!<>e$G$bF1MM$KF0:n$9$k!%(B +quilt$B$O%j%S%8%g%s4IM}%D!<%k$K$D$$$F$OA4$/4XCN$7$J$$$?$a!$E83+$5$l$?(Btar$B%"!<(B +$B%+%$%V>e$G$b!$(BSubversion$B$N%o!<%-%s%0%3%T!<>e$G$bF1MM$KF0:n$9$k!%(B %\subsection{From patchwork quilt to Mercurial Queues} \subsection{patchwork quilt$B$+$i(BMercurial Queues$B$X(B} @@ -236,7 +236,7 @@ %leaving unneeded---or worse, misleading or destabilising---traces of %your missteps and errors in the permanent revision record. -$BEAE}E*$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O!$9T$J$C$?A`:n$N1J5WE*$GIT2D5UE*$J(B +$BEAE}E*$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O!$9T$C$?A`:n$N1J5WE*$GIT2D5UE*$J(B $B5-O?$r;D$9!%$3$l$K$OBg$-$J2ACM$,$"$k0lJ}$G!$5g6~$K46$8$k$3$H$b$"$k!%$b$7(B $B2a7c$J<B83$r$9$k$N$G$"$l$P!$$I$N$h$&$K?J$a$k$+?5=E$K$9$kI,MW$,$"$k!%$5$b(B $B$J$1$l$P!$ITMW$J!$$"$k$$$O8m2r$r>7$$$?$j!$0BDj@-$rB;$J$&%H%l!<%9$H%(%i!<(B @@ -271,7 +271,7 @@ $BMQ$5$l$?%Q%C%A$O!$4XO"$E$1$i$l$?%A%'%s%8%;%C%H$r;}$D$?$a!$(B \hgcmdargs{log}{\emph{filename}}$B$K$h$C$F$I$N%A%'%s%8%;%C%H$H%Q%C%A$,%U%!(B $B%$%k$K1F6A$rM?$($F$$$k$+D4$Y$k$3$H$,$G$-$k!%(B\hgext{bisect}$B%3%^%s%I$GA4$F(B -$B$N%A%'%s%8%;%C%H$HE,MQ$5$l$?%Q%C%A$KBP$7$F%P%$%J%j%5!<%A$r9T$J$$!$$I$3$G(B +$B$N%A%'%s%8%;%C%H$HE,MQ$5$l$?%Q%C%A$KBP$7$F%P%$%J%j%5!<%A$r9T$$!$$I$3$G(B $B%P%0$,:.F~$7$?$+!$$"$k$$$O=$@5$5$l$?$+$rD4$Y$k$3$H$,$G$-$k!%(B \hgcmd{annotate}$B%3%^%s%I$G$I$N%A%'%s%8%;%C%H$+%Q%C%A$,%=!<%9%U%!%$%k$NFC(B $BDj$N9T$rJQ99$7$?$+8+$k$3$H$,$G$-$k!%(B @@ -466,8 +466,8 @@ \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{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!$(B1$B9T$K(B1$B$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 @@ -708,7 +708,7 @@ %files affected by the patch that it is popping. Be sure to read the %documentation for a command's \option{-f} option before you use it! -$B%o!<%-%s%0%G%#%l%/%H%j$N%A%'%C%/$r9T$J$&%3%^%s%I$OA4$F!$>e5i<T8~$1$N6/@)(B +$B%o!<%-%s%0%G%#%l%/%H%j$N%A%'%C%/$r9T$&%3%^%s%I$OA4$F!$>e5i<T8~$1$N6/@)(B $B%*%W%7%g%s(B\option{-f}$B$r;}$C$F$$$k!%(B\option{-f}$B$N87L)$J0UL#$O!$%3%^%s%I$K(B $B$h$C$F0[$J$k!%Nc$($P(B\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}}$B$O8IN)$7$?JQ(B $B99$r?7$7$$%Q%C%A$K<h$j9~$`$H$$$&0UL#$@$,!$(B @@ -725,7 +725,7 @@ %work on \emph{that} patch for a while. \hgxcmd{mq}{qrefresh}$B%3%^%s%I$O(B\emph{$B:G$b>e(B}$B$KE,MQ$5$l$?%Q%C%A$KBP$7$F%j(B -$B%U%l%C%7%e$r9T$J$&!%$3$l$O%j%U%l%C%7%e$K$h$C$F(B1$B$D$N%Q%C%A$K8=:_$N:n6H$r%5(B +$B%U%l%C%7%e$r9T$&!%$3$l$O%j%U%l%C%7%e$K$h$C$F(B1$B$D$N%Q%C%A$K8=:_$N:n6H$r%5(B $B%9%Z%s%I$7$?$j!$JL$N%H%C%W%Q%C%A$d0l;~E*$K:n6H$9$k$?$a%Q%C%A$r:n$k$?$a$K(B $B%]%C%W$d%W%C%7%e$,$G$-$k$H$$$&$3$H$r0UL#$9$k!%(B @@ -744,9 +744,9 @@ $B$H$9$k!%:G=i$N$b$N$O$"$J$?$N%=%U%H%&%'%"$N%3%"$rJQ99$7!$(B2$BHVL\$N$b$N$O(B1$BHV(B $BL\$N$b$N$N>e$KE83+$9$k!$:#DI2C$7$?%3%"$N%3!<%I$r;H$C$?%f!<%6%$%s%?%U%'!<(B $B%9$@$H$9$k!%(BUI$B%Q%C%A$G:n6HCf$K%3%"$N%P%0$K5$IU$$$?$H$9$k$H!$4JC1$K%3%"$N(B -$B=$@5$O9T$J$($k!%C1=c$K(B\hgxcmd{mq}{qrefresh}$B$K$h$C$F?J9TCf$N(BUI$B%Q%C%A$r%;!<(B +$B=$@5$O9T$($k!%C1=c$K(B\hgxcmd{mq}{qrefresh}$B$K$h$C$F?J9TCf$N(BUI$B%Q%C%A$r%;!<(B $B%V$7!$(B\hgxcmd{mq}{qpop}$B$K$h$C$F%3%"%Q%C%A$XAL$k!%%3%"$N%P%0$r=$@5$7$?8e(B -$B$K(B\hgxcmd{mq}{qrefresh}$B$r%3%"%Q%C%A$K$D$$$F9T$J$$!$(B\hgxcmd{mq}{qpush}$B$G(B +$B$K(B\hgxcmd{mq}{qrefresh}$B$r%3%"%Q%C%A$K$D$$$F9T$$!$(B\hgxcmd{mq}{qpush}$B$G(B UI$B%Q%C%A$KLa$C$F:n6H$rB3$1$k!%(B %\section{More about patches} @@ -768,7 +768,7 @@ %pathnames usually have an extra component on the front that isn't %present in the actual path name. This is a holdover from the way that %people used to generate patches (people still do this, but it's -%somewhat rare with modern revision control tools). +%somewhat rare with modern revision control tools). $B%Q%C%A$N%U%!%$%k%X%C%@$r8+$k$H!$%Q%9%M!<%`$N:G=i$KDI2C$NItJ,$,$D$$$F$$$k(B $B$N$K5$$E$/$O$:$@!%$3$l$O<B:]$N%Q%9%M!<%`$K$OB8:_$7$J$$$b$N$G!$%Q%C%A$r@8(B @@ -780,19 +780,20 @@ %unpack the tarball again (hence the need for the rename), and use the %\cmdopt{diff}{-r} and \cmdopt{diff}{-N} options to \command{diff} to %recursively generate a patch between the unmodified directory and the -%modified one. +%modified one. %The result would be that the name of the unmodified %directory would be at the front of the left-hand path in every file %header, and the name of the modified directory would be at the front %of the right-hand path. -$B%"%j%9$,(Btar$B%\!<%k$r2rE`$7!$%U%!%$%k$rJT=8$7!$%Q%C%A$r:n$j$?$$$H;W$C$F$$$k(B -$B$H$9$k!%H`=w$O%o!<%-%s%0%G%#%l%/%H%j$r%j%M!<%`$7$F(Btar$B%\!<%k$r$b$&0lEY2rE`(B -$B$7!J$3$N$?$a$K%j%M!<%`$,I,MW$@$C$?!K!$(B\command{diff}$B$K(B\cmdopt{diff}{-r}$B$H(B -\cmdopt{diff}{-N}$B%*%W%7%g%s$r$D$1$F!$85$N$^$^$N%G%#%l%/%H%j$HJQ99$7$?%G%#(B -$B%l%/%H%j$N4V$G:F5"E*$K%Q%C%A$r@8@.$9$k$@$m$&!%@8@.$5$l$?%Q%C%A$G$O!$A4$F(B -$B$N%U%!%$%k%X%C%@$G85$N$^$^$N%G%#%l%/%H%j$NL>A0$,:8B&$N%Q%9$N@hF,$K!$JQ99(B -$B$5$l$?%G%#%l%/%H%j$NL>A0$,1&B&$N%Q%9$N@hF,$K8=$l$k!%(B +$B%"%j%9$,(Btar$B%"!<%+%$%V$rE83+$7!$%U%!%$%k$rJT=8$7!$%Q%C%A$r:n$j$?$$$H;W$C$F(B +$B$$$k$H$9$k!%H`=w$O:9J,$r<h$k$?$a$K$^$::n6H$7$F$$$k%G%#%l%/%H%j$r%j%M!<%`(B +$B$7!$(B tar$B%"!<%+%$%V$r$b$&0lEYE83+$9$k!%$=$7$F%*%j%8%J%k$N$^$^$N%G%#%l%/%H(B +$B%j$H!$JQ99$r9T$J$C$?%G%#%l%/%H%j$N4V$G!$$=$7$F(B\command{diff}$B$K(B +\cmdopt{diff}{-r}$B$H(B\cmdopt{diff}{-N}$B%*%W%7%g%s$rIU$1$F!$:F5"E*$J:9J,$r<h(B +$B$j!$%Q%C%A$r@8@.$9$k$@$m$&!%@8@.$5$l$?%Q%C%A%U%!%$%k$r8+$k$H!$3F%U%!%$%k(B +$B$N%X%C%@ItJ,$G:8JUCM$N@hF,$K%*%j%8%J%k$NJ}$N%G%#%l%/%H%jL>$,8=$l!$1&JUCM(B +$B$N@hF,$KJQ99$7$?J}$N%G%#%l%/%H%jL>$,8=$l$F$$$k$O$:$G$"$k!%(B %Since someone receiving a patch from the Alices of the net would be %unlikely to have unmodified and modified directories with exactly the @@ -801,11 +802,11 @@ %strip when trying to apply a patch. This number is called the %\emph{strip count}. -$B%M%C%H>e$N%"%j%9$?$A$+$i%Q%C%A$r<u$1<h$C$??M$O!$JQ99$J$7$N%G%#%l%/%H%j$H(B -$BJQ99$5$l$?%G%#%l%/%H%j$NN>J}$r%"%j%9$HF1$8L>A0$G;}$C$F$$$k2DG=@-$O$^$:$J(B -$B$$!%(B\command{patch}$B%3%^%s%I$K$O(B\cmdopt{patch}{-p}$B%*%W%7%g%s$,$"$j!$%Q%C(B -$B%A$rE,MQ$9$k;~$K%Q%9$NMWAG$r@hF,$+$i$$$/$D:o$k$+$r;XDj$G$-$k!%$3$N?t$O(B -\emph{$B%9%H%j%C%W%+%&%s%H(B}$B$H8F$P$l$k!%(B +$B%M%C%H>e$NB??t$N%"%j%9$?$A$+$i%Q%C%A$r<u$1<h$C$??M$O!$JQ99$J$7$N%G%#%l%/(B +$B%H%j$HJQ99$5$l$?%G%#%l%/%H%j$NN>J}$r%"%j%9$HF1$8L>A0$G;}$C$F$$$k2DG=@-$O(B +$B$^$:$J$$!%(B\command{patch}$B%3%^%s%I$K$O(B\cmdopt{patch}{-p}$B%*%W%7%g%s$,$"$j!$(B +$B%Q%C%A$rE,MQ$9$k;~$K%Q%9$NMWAG$r@hF,$+$i$$$/$D:o$k$+$r;XDj$G$-$k!%$3$N?t(B +$B$O(B\emph{$B%9%H%j%C%W%+%&%s%H(B}$B$H8F$P$l$k!%(B %An option of ``\texttt{-p1}'' means ``use a strip count of one''. If %\command{patch} sees a file name \filename{foo/bar/baz} in a file @@ -949,7 +950,7 @@ \item $B<B9T%S%C%H$r9MN8$7$J$$$@$1$G$J$/!$?7$7$$%U%!%$%k$rFI$_<h$j2DG=B0(B $B@-$G:n@.$7!$<B9T2DG=B0@-$OIU$1$J$$!%(B \item \command{patch}$B%3%^%s%I$O%U%!%$%k$N:o=|$r:o=|$5$l$k%U%!%$%k$HCf?H(B - $B$,$+$i$N%U%!%$%k$H$N:9J,$H$7$F07$&!%=>$C$F!$%U%!%$%k$r:o=|$9$k$H$$(B + $B$,6u$N%U%!%$%k$H$N:9J,$H$7$F07$&!%=>$C$F!$%U%!%$%k$r:o=|$9$k$H$$(B $B$&$3$H$O!$%Q%C%A%U%!%$%k$NCf$G$O%U%!%$%k$NCf$NA4$F$N9T$r:o=|$9$k$3(B $B$H$HEy2A$G$"$k!%(B \item \command{patch}$B%3%^%s%I$O%U%!%$%k$NDI2C$r6u$N%U%!%$%k$HDI2C$5$l$k(B @@ -995,11 +996,11 @@ $B%*%U%;%C%H$d(Bfuzz factor$B$N=P$?%Q%C%A$r%j%U%l%C%7%e$9$k$N$OB?$/$N>l9gNI$$9M(B $B$($G$"$k!%%Q%C%A$r%j%U%l%C%7%e$9$k$H!$?7$7$$%3%s%F%-%9%H>pJs$,@8@.$5$l!$(B -$B%Q%C%A$,%/%j!<%s$KE,MQ$G$-$k$h$&$K$J$k!%!V>o$K!W$G$O$J$J$/!VB?$/$N>l9g!W(B -$B$HCG$C$?$N$O!$%Q%C%A$r%j%U%l%C%7%e$9$k$3$H$G!$85$N%U%!%$%k$N0[$J$C$?%j%S(B -$B%8%g%s$G%Q%C%A$,E,MQ$G$-$J$/$J$k$3$H$,$"$k$+$i$@!%J#?t$N%P!<%8%g%s$N%=!<(B -$B%9%D%j!<$N>e$GE,MQ2DG=$J%Q%C%A$r4IM}$7$J$1$l$P$J$i$J$$$h$&$J>l9g$J$I$O!$(B -$B%Q%C%A$N7k2L$r8!>Z$7$F$"$k$N$G$"$l$P(Bfuzz$B$N=P$k%Q%C%A$b5vMF$5$lF@$k!%(B +$B%Q%C%A$,%/%j!<%s$KE,MQ$G$-$k$h$&$K$J$k!%!V>o$K!W$G$O$J$/!VB?$/$N>l9g!W$H(B +$BCG$C$?$N$O!$%Q%C%A$r%j%U%l%C%7%e$9$k$3$H$G!$85$N%U%!%$%k$N0[$J$C$?%j%S%8%g(B +$B%s$G%Q%C%A$,E,MQ$G$-$J$/$J$k$3$H$,$"$k$+$i$@!%J#?t$N%P!<%8%g%s$N%=!<%9%D(B +$B%j!<$N>e$GE,MQ2DG=$J%Q%C%A$r4IM}$7$J$1$l$P$J$i$J$$$h$&$J>l9g$J$I$O!$%Q%C(B +$B%A$N7k2L$r8!>Z$7$F$"$k$N$G$"$l$P(Bfuzz$B$N=P$k%Q%C%A$b5vMF$5$lF@$k!%(B %\subsection{Handling rejection} \subsection{$B%j%8%'%/%H$N<h$j07$$(B} @@ -1439,7 +1440,7 @@ MQ$B$N(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$O(BMercurial$B%j%]%8%H%j$N%o!<%-%s%0(B $B%G%#%l%/%H%j$N30$K$"$k$N$G!$(B``$B2<0L$N(B''Mercurial$B%j%]%8%H%j$O%Q%C%A$N4IM}(B -$B$d!$$=$NB;0&;yBP$K$D$$$F2?$bCN$i$J$$!%(B +$B$d!$$=$NB8:_<+BN$K$D$$$F2?$bCN$i$J$$!%(B %This presents the interesting possibility of managing the contents of %the patch directory as a Mercurial repository in its own right. This @@ -1478,8 +1479,8 @@ %may not control. $B%j%]%8%H%jFb$G%Q%C%A$r4IM}$9$k$H!$J#?t$N3+H/<T$,F1$8%Q%C%A%7%j!<%:$N>e$G(B -$B>WFM$9$k$3$H$J$/:n6H$G$-$k$h$&$K$J$k!%$3$l$OH`$i$,2<0L$N%=!<%9%Y!<%9$r%3(B -$B%s%H%m!<%k$G$-$k$+H]$+$K4X$o$j$,$J$$!%(B +$B%3%s%U%j%/%H$9$k$3$H$J$/:n6H$G$-$k$h$&$K$J$k!%$3$l$OH`$i$,2<0L$N%=!<%9%Y!<(B +$B%9$r%3%s%H%m!<%k$G$-$k$+H]$+$K4X$o$j$,$J$$!%(B %\subsection{MQ support for patch repositories} \subsection{MQ$B$K$h$k%Q%C%A%j%]%8%H%j%5%]!<%H(B} @@ -1637,9 +1638,9 @@ %simple techniques to keep your work well organized. $B%U%j!<%=%U%H$d%*!<%W%s%=!<%9%W%m%8%'%/%H$KDs=P$9$k$?$a$N%Q%C%A%7%j!<%:$K(B -$BBP$7$F:n6H$7$F$$$k$H$-$d!$:n6H$,=*$C$?$H$-$KDL>o$N%A%'%s%8%;%C%H$H$7$F<h(B -$B$j9~$^$l$kM=Dj$N%Q%C%A%7%j!<%:$KBP$7$F$@9T$7$F$$$k$H$-$O!$:n6H$r$&$^$/7O(B -$BE}$E$1$k$?$a$NC1=c$J%F%/%K%C%/$,$"$k!%(B +$BBP$7$F:n6H$7$F$$$k$H$-$d!$%Q%C%A$H$7$F$N:n6H$,=*$C$?:]$KDL>o$N%A%'%s%8%;%C(B +$B%H$H$7$F<h$j9~$`M=Dj$N%Q%C%A%7%j!<%:$KBP$7$F:n6H$7$F$$$k$H$-$O!$:n6H$r$&(B +$B$^$/9T$J$&$?$a$N%7%s%W%k$J%F%/%K%C%/$,$"$k!%(B %Give your patches descriptive names. A good name for a patch might be %\filename{rework-device-alloc.patch}, because it will immediately give
--- a/ja/preface.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/preface.tex Sat Jul 11 19:25:35 2009 +0900 @@ -1,5 +1,5 @@ %\chapter*{Preface} -\chapter*{$B$^$($,$-(B} +\chapter*{$B$O$8$a$K(B} \addcontentsline{toc}{chapter}{Preface} \label{chap:preface} @@ -7,8 +7,8 @@ %thus far grown due to people's willingness to strike out into %ill-charted territory. -$BJ,;6%j%S%8%g%s%3%s%H%m!<%k$OHf3SE*?7$7$$NN0h$G$"$j!$$3$l$^$G$N4V0c$C$?NN(B -$B0h$+$iH4$1=P$=$&$H$$$&?M!9$N0U;V$G5^B.$KH/E8$7$F$$$k!%(B +$BJ,;6%j%S%8%g%s%3%s%H%m!<%k$OHf3SE*?7$7$$NN0h$G$"$j!$$3$l$^$G$N4V0c$C$?$d(B +$B$j$+$?$+$iH4$1=P$=$&$H$$$&?M!9$N;W$$$G5^B.$KH/E8$7$F$$$k!%(B %I am writing a book about distributed revision control because I %believe that it is an important subject that deserves a field guide. @@ -16,15 +16,13 @@ %learn the terrain with, and yet it scales to the demands of real, %challenging environments where many other revision control tools fail. -$BI.<T$,J,;6%j%S%8%g%s%3%s%H%m!<%k$K$D$$$F$NK\$r=q$$$F$$$k$N$O!$$3$l$,%U%#!<(B -$B%k%I%,%$%I$rI,MW$H$9$k=EMW$J2]Bj$@$H;W$C$?$+$i$@!%(BMercurial$B$K$D$$$F=q$3$&(B -$B$HA*$s$@$N$O!$$3$l$,A4BN$r3X$V$N$,:G$b4JC1$J%D!<%k$G!$$7$+$bB>$N%j%S%8%g(B -$B%s%3%s%H%m!<%k%D!<%k$,1}!9$K$7$F<:GT$7$F$$$k!$<B:]$ND)@oE*$J4D6-$N5a$a$K(B -$B9g$o$;$F%9%1!<%k$9$k%D!<%k$@$+$i$@!%(B - +$BI.<T$,J,;6%j%S%8%g%s%3%s%H%m!<%k$NK\$r=q$$$?M}M3$O!$$3$l$,%U%#!<%k%I%,%$(B +$B%I$r=q$/$N$KAj1~$7$$=EMW$J%F!<%^$@$H9M$($?$+$i$G$"$k!%BP>]$H$7$F(B +Mercurial$B$rA*$s$@M}M3$O!$A4BN$N3X=,$,:G$bMF0W$J%D!<%k$G$"$j!$B>$N%j%S%8%g(B +$B%s%3%s%H%m!<%k%D!<%k$G$OF@$,$?$$%9%1!<%i%S%j%F%#$rM-$7$F$$$k$+$i$@!%(B %\section{This book is a work in progress} -\section{$B$3$NK\$O<9I.Cf$G$"$k(B} +\section{$B$3$NK\$O8=:_<9I.Cf$G$"$k(B} %I am releasing this book while I am still writing it, in the hope that %it will prove useful to others. I also hope that readers will @@ -67,11 +65,11 @@ %seconds, with any resulting timestamps correspondingly spread out, my %automated example scripts run many commands in one second. -$B$3$N%"%W%m!<%A$N>.$5$J7gE@$O!$Nc$NCf$G8+$i$l$kF|IU$H;~9o$,?M4V$,%?%$%W$7(B -$B$F$$$l$PM-$jF@$J$$$[$I(B``$B=8$^$C$F(B''$B$7$^$C$F$$$k$3$H$@!%?M4V$G$"$l$P!$(B1$B$D$N(B -$B%3%^%s%I$r<B9T$9$k$N$K?tIC$O$+$+$j!$%?%$%`%9%?%s%W$O9-$$HO0O$K3H$,$k$O$:(B -$B$N$H$3$m$,!$$3$NK\$GNc$r:n@.$9$k%9%/%j%W%H$G$O!$(B1$BIC$KB?$/$N%3%^%s%I$r<B9T(B -$B$7$F$7$^$&!%(B +$B$3$N%"%W%m!<%A$N>.$5$J7gE@$O!$Nc$NCf$K8=$l$kF|IU$H;~9o$,!$?M4V$N%?%$%W$G(B +$B$OM-$jF@$J$$$[$I(B``$B8G$^$C$F(B''$B$7$^$C$F$$$k$3$H$@!%?M4V$G$"$l$P!$(B1$B$D$N%3%^%s(B +$B%I$r<B9T$9$k$N$K?tIC$O$+$+$j!$%?%$%`%9%?%s%W$O9-$$HO0O$K3H$,$k$O$:$N$H$3(B +$B$m$,!$$3$NK\$GNc$r:n@.$9$k%9%/%j%W%H$G$O!$(B1$BIC$N4V$KB?$/$N%3%^%s%I$r<B9T$7(B +$B$F$7$^$&!%(B %As an instance of this, several consecutive commits in an example can %show up as having occurred during the same second. You can see this @@ -110,7 +108,7 @@ $B$3$NK\$N40A4$J%=!<%9$O!$(B\url{http://hg.serpentine.com/mercurial/book}$B$K(B $B$F(BMercurial$B%j%]%8%H%j$H$7$F8x3+$5$l$F$$$k!%(B -%%% Local Variables: +%%% Local Variables: %%% mode: yatex %%% TeX-master: "00book" -%%% End: +%%% End:
--- a/ja/srcinstall.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/srcinstall.tex Sat Jul 11 19:25:35 2009 +0900 @@ -44,7 +44,7 @@ python setup.py install --force --home=\$HOME \end{codesample4} \end{enumerate} -$B%$%s%9%H!<%k$r9T$J$&$H!$(BMercurial$B$O%f!<%6%[!<%`%G%#%l%/%H%jFb$N(B +$B%$%s%9%H!<%k$r9T$&$H!$(BMercurial$B$O%f!<%6%[!<%`%G%#%l%/%H%jFb$N(B \texttt{bin}$B%5%V%G%#%l%/%H%j$K<}$a$i$l$k!%$3$N%G%#%l%/%H%j$,%7%'%k$N%3%^(B $B%s%I%5!<%A%Q%9$K$"$k$N$r3NG'$9$k$3$H!%(B @@ -87,10 +87,10 @@ $B$b$7(BMercurial$B$r(BWindows$B>e$G%=!<%9$+$i%S%k%I$7$?$$$N$G$"$l$P!$(BMercurial wiki \url{http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall} $B$N(B -``hard way''$B$N@bL@$K=>$C$F9T$J$&!%$3$NJ}K!$G$OB?$/$NLLE]$J:n6H$,BT$A9=$((B +``hard way''$B$N@bL@$K=>$C$F9T$&!%$3$NJ}K!$G$OB?$/$NLLE]$J:n6H$,BT$A9=$((B $B$F$$$k$3$H$r3P8g$9$kI,MW$,$"$k!%(B -%%% Local Variables: +%%% Local Variables: %%% mode: yatex %%% TeX-master: "00book" -%%% End: +%%% End:
--- a/ja/template.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/template.tex Sat Jul 11 19:25:35 2009 +0900 @@ -102,8 +102,8 @@ $B$3$N%^%K%e%"%k$G=q$$$F$$$k$h$&$K!$$3$l$^$G$N$H$3$m!$$3$l$i$N%3%^%s%I$@$1(B $B$,%9%?%$%k$H%F%s%W%l!<%H$r%5%]!<%H$7$F$$$k!%$3$l$i$,%+%9%?%^%$%:2DG=$J=P(B $BNO$,I,MW$J:G$b=EMW$J%3%^%s%I$G$"$k$?$a!$(B Mercurial$B$N%f!<%6%3%_%e%K%F%#$+(B -$B$iB>$N%3%^%s%I$K%9%?%$%k$H%F%s%W%l!<%H%5%]!<%H$rE,MQ$+$N$&$K$;$h$H$$$&%W(B -$B%l%C%7%c!<$O$[$H$s$I$J$$!%(B +$B$iB>$N%3%^%s%I$K%9%?%$%k$H%F%s%W%l!<%H%5%]!<%H$rE,MQ2DG=$K$;$h$H$$$&%W%l%C(B +$B%7%c!<$O$[$H$s$I$J$$!%(B %\section{The basics of templating} \section{$B%F%s%W%l!<%H$N4pK\(B} @@ -112,9 +112,9 @@ %text never changes, while other parts are \emph{expanded}, or replaced %with new text, when necessary. -$B:G$bC1=c$J(BMercurial$B%F%s%W%l!<%H$O%F%-%9%HJR$G$"$k!%%F%-%9%H$N$"$kItJ,$OIT(B -$BJQ$G!$B>$NItJ,$OI,MW$K1~$8$F(B\emph{$BE83+(B}$B$5$l$k$?$j?7$7$$%F%-%9%H$KCV49$5$l(B -$B$k!%(B +$B:G$bC1=c$J(BMercurial$B%F%s%W%l!<%H$O%F%-%9%H$NCGJR$G$"$k!%%F%-%9%H$N0lIt$OI,(B +$BMW$K1~$8$F(B\emph{$BE83+(B}$B$5$l$?$j?7$7$$%F%-%9%H$KCV49$5$l!$JL$NItJ,$OITJQ$G(B +$B$"$k!%(B %Before we continue, let's look again at a simple example of %Mercurial's normal output. @@ -320,9 +320,9 @@ %common filter, \tplkwfilt{date}{isodate}, in action above, to make a %date readable. -$B%F%s%W%l!<%HE83+$N7k2L$N$&$A!$$$$/$D$+$O$?$d$9$/MxMQ$G$-$k$b$N$G$O$J$$!%(B -Mercurial$B$OE83+$5$l$k%-!<%o!<%I$rJQ99$9$k$?$a$N0lO"$N(B\emph{filters}$B%*%W%7%g(B -$B%s$rDs6!$7$F$$$k!%F|;~$r2DFI$K$9$k$?$a$K$h$/MQ$$$i$l$k(B +$B%F%s%W%l!<%HE83+$N7k2L$K$O!$$=$N$^$^$G$OMxMQ$7$E$i$$$b$N$b$"$k!%(B +Mercurial$B$,Ds6!$9$k(B\emph{filters}$B%*%W%7%g%s$rMQ$$$F!$E83+$5$l$?%-!<%o!<%I(B +$B$rFI$_$d$9$/2C9)$9$k$3$H$,$G$-$k!%F|;~$r2DFI$K$9$k$?$a$K$h$/MQ$$$i$l$k(B \tplkwfilt{date}{isodate}$B%U%#%k%?$NF0:nNc$K$D$$$F$O4{$K8+$F$-$?!%(B %Below is a list of the most commonly used filters that Mercurial @@ -543,9 +543,10 @@ %further 8~characters (at least on Unix-like systems, where a tab is %conventionally 8~characters wide). -$BK>$_$N=PNO$r$($k$?$a$KJ#?t$N%U%#%k%?$rAH$_9g$o$;$k$N$O$?$d$9$$!%0J2<$N0l(B -$BO"$N%U%#%k%?$O@bL@J8$r@0M}$7!$$-$l$$$K(B68$B7e$K<}$^$k$h$&$K@07A$7!$(B8$BJ8;z$N(B -$B%$%s%G%s%H$r9T$&!%!J(BUNIX$B%7%9%F%`$G$O%?%V$O=,47E*$K(B8$B7eJ,$NI}$r;}$D!%!K(B +$BJ#?t$N%U%#%k%?$rAH$_9g$o$;!$K>$_$N=PNO$r4JC1$K:n$k$3$H$,$G$-$k!%$3$3$G$O(B +$BNc$H$7$F!$@bL@J8$r@0M}$7!$$-$l$$$K(B68$B7e$K<}$^$k$h$&$K@07A$7!$(B8$BJ8;z$N%$%s%G(B +$B%s%H$r9T$&%U%#%k%?%A%'!<%s$r<($9!%!J(BUNIX$B%7%9%F%`$N=,47$G$O!$%?%VI}$O(B8$B7e$G(B +$B$"$k!%!K(B \interaction{template.simple.combine}
--- a/ja/tour-basic.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/tour-basic.tex Sat Jul 11 19:25:35 2009 +0900 @@ -762,9 +762,7 @@ \sfilename{.hgrc}$B$H$$$&%U%!%$%k$r:n@.$9$k!%(B Mercurial$B$O$3$N%U%!%$%k$+$i8D(B $B?M@_Dj$r<hF@$7!$;HMQ$9$k!%(B\sfilename{.hgrc}$B%U%!%$%k$N:G=i$NFbMF$O0J2<$N$h(B $B$&$J=q<0$K$9$k!%(B -\begin{footnote} -Windows$B$G$NE,@Z$J%G%#%l%/%H%j$r<($9$3$H!%(B -\end{footnote} +\footnote{Windows$B$G$NE,@Z$J%G%#%l%/%H%j$r<($9$3$H!%(B} \begin{codesample2} # This is a Mercurial configuration file. [ui]
--- a/ja/tour-merge.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/tour-merge.tex Sat Jul 11 19:25:35 2009 +0900 @@ -84,9 +84,9 @@ %also known. The tip revision is thus a head, because the newest %revision in a repository doesn't have any children, but a repository %can contain more than one head. -head$B$O;RB9$d;R$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R$r;}(B -$B$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t$N(B -head$B$r;}$AF@$k!%(B +head$B$O;R$d$=$N;RB9$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R(B +$B$r;}$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t(B +$B$N(Bhead$B$r;}$AF@$k!%(B \begin{figure}[ht] \centering @@ -157,8 +157,8 @@ %until we \hgcmd{commit} the results of the merge. %\interaction{tour.merge.commit} -$B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B2 -$B$D$N%Z%"%l%s%H$rI=<($9$k!%(B +$B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B +$B?F(B2$B$D$rI=<($9$k!%(B \interaction{tour.merge.commit} %We now have a new tip revision; notice that it has \emph{both} of @@ -283,7 +283,7 @@ % most recent version from which the two versions we're trying to % merge are descended. \item $B:8$K$"$k$N$O%U%!%$%k$N(B\emph{$B%Y!<%9(B}$B%P!<%8%g%s$G$"$k!%$3$l$O$3$l$+(B - $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b:G6a$N%P!<%8%g%s(B + $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b?7$7$$%P!<%8%g%s(B $B$G$"$k!%(B %\item In the middle is ``our'' version of the file, with the contents @@ -436,7 +436,7 @@ %use from the command line, while others work ``behind the scenes,'' %for example adding capabilities to the server. -Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%96e(B +Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%/%9(B $B%F%s%7%g%s%a%+%K%:%`$rDs6!$7$F$$$k!%%3%^%s%I%i%$%s$+$iMxMQ$G$-$k?7$7$$%3(B $B%^%s%I$rDI2C$9$k$h$&$J%(%/%9%F%s%7%g%s$b$"$l$P!$L\$K8+$($J$$$H$3$m$GNc$((B $B$P%5!<%P$K5!G=$rDI2C$9$k$h$&$J$b$N$b$"$k!%(B
--- a/ja/undo.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/undo.tex Sat Jul 11 19:25:35 2009 +0900 @@ -76,8 +76,8 @@ \interaction{rollback.status} $B%3%_%C%H$O(B\filename{a}$B$X$NJQ99$r4^$s$G$$$k$,!$(B\filename{b}$B$X$NJQ99$O4^$s(B $B$G$$$J$$!%$3$3$G;d$,F1N=$H6&M-$7$F$$$k%j%]%8%H%j$X%A%'%s%8%;%C%H$N%W%C%7%e(B -$B$r9T$J$C$?$H$7$?$i!$H`$i$,JQ99$r%W%k$7$?;~!$(B\filename{a}$B$NCf$N2?$+$,H`$i(B -$B$N%j%]%8%H%j$K4^$^$l$J$$(B\filename{b}$B$X$N;2>H$r9T$J$&2DG=@-$O9b$$!%$=$&$J$C(B +$B$r9T$C$?$H$7$?$i!$H`$i$,JQ99$r%W%k$7$?;~!$(B\filename{a}$B$NCf$N2?$+$,H`$i(B +$B$N%j%]%8%H%j$K4^$^$l$J$$(B\filename{b}$B$X$N;2>H$r9T$&2DG=@-$O9b$$!%$=$&$J$C(B $B$?$iI.<T$OF1N=$NE\$j$rGc$&$3$H$K$J$k$@$m$&!%(B %However, luck is with me---I've caught my error before I pushed the @@ -96,7 +96,7 @@ \hgcmd{rollback}$B%3%^%s%I$r;HMQ$9$k$3$H$G(BMercurial$B$+$i:G8e$N99?7$r<h$j=|(B $B$/$3$H$,$G$-$k!%(B \interaction{rollback.rollback} -$B%A%'%s%8%;%C%H$O$j$]$8$H$j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B +$B%A%'%s%8%;%C%H$O%j%]%8%H%j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B $B$N(B\filename{a}$B$OJQ99$5$l$?$HG'<1$5$l$k!%%3%_%C%H$7$F%m!<%k%P%C%/$9$k$H!$(B $B%o!<%-%s%0%G%#%l%/%H%j$O40A4$K%3%_%C%HA0$N>uBV$K$J$j!$%A%'%s%8%;%C%H$O40(B $BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hgcmd{add} \filename{b}$B$7!$$b$&0lEY(B @@ -128,10 +128,11 @@ %changes into the repository. $B$3$3$G$"$J$?$O8m$C$F%m!<%+%k$N(B0.9$B%j%]%8%H%j$K6&M-(B1.0$B%j%]%8%H%j$+$i%W%k$7(B -$B$?$H$9$k!%:G0-$N>l9g!$==J,Cm0U$;$:!$$3$l$r6&M-$N(B0.9$B%j%]%8%H%j$K=q$-La$7$F(B +$B$?$H$9$k!%:G0-$N>l9g!$Cm0U$rBU$C$F!$$3$l$r6&M-$N(B0.9$B%j%]%8%H%j$K=q$-La$7$F(B $B$7$^$$!$3+H/%A!<%`A4BN$r:.Mp$5$;$F$7$^$&$3$H$,M-$jF@$k!%!J$3$N>l9g$I$&$9(B -$B$l$P$$$$$N$+$K$D$$$F$O8e=R$9$k!%!K$7$+$7(BMercurial$B$O%W%k85$N(BURL$B$H5?$$$r;}(B -$B$D$K==J,$J5pBg$JJQ99$rI=<($9$k$?$a!$B(:B$K5$$E$/2DG=@-$,9b$$!%(B +$B$l$P$$$$$N$+$K$D$$$F$O8e=R$9$k!%!K<B:]$K$O!$(BMercurial$B$O(Bpull$B85$N(BURL$B$rI=<((B +$B$9$k$7!$4V0c$C$?%j%]%8%H%j$+$i(Bpull$B$9$l$PBgNL$N%A%'%s%8%;%C%H$,I=<($5$l$k(B +$B$?$a!$B(:B$K2?$+$,$*$+$7$$$H5$$E$/$3$H$@$m$&!%(B %The \hgcmd{rollback} command will work nicely to expunge all of the %changesets that you just pulled. Mercurial groups all changes from @@ -207,7 +208,7 @@ $B%6%/%7%g%s0l2sJ,$N$_$r5-O?$7$F$$$k!%%m!<%k%P%C%/0l2sKh$K0l$DA0$N%j%S%8%g(B $B%s$KLa$k$o$1$G$O$J$$!%(B \interaction{rollback.twice} -$B%j%]%8%H%j$J$$$G0lEY%m!<%k%P%C%/$7$?$i!$JL$N%3%_%C%H$r$9$k$+%W%k$r$9$k$^(B +$B%j%]%8%H%jFb$G0lEY%m!<%k%P%C%/$7$?$i!$JL$N%3%_%C%H$r$9$k$+%W%k$r$9$k$^(B $B$G%m!<%k%P%C%/$O$G$-$J$$!%(B @@ -263,12 +264,11 @@ %\end{itemize} \hgcmd{revert}$B%3%^%s%I$,07$($k%1!<%9$K$D$$$F$^$H$a$k!%$h$j>\$7$$@bL@$O!$(B -$B8e$N@a$G9T$J$&!%(B +$B8e$N@a$G9T$&!%(B \begin{itemize} \item $B%U%!%$%k$rJQ99$7$?>l9g!$(B\hgcmd{revert}$B$O%U%!%$%k$rJQ99$5$l$kA0$N>u(B $BBV$KLa$9!%(B - \item \hgcmd{add}$B$r<B9T$7$?>l9g!$(B\hgcmd{revert}$B$O(Badd$B$r<h$j>C$9$,!$%U%!%$(B $B%k<+BN$O$=$N$^$^<j$r?($l$:$K;D$9!%(B \item Mercurial$B$rA`:n$;$:$K%U%!%$%k$r>C5n$7$F$$$?>l9g!$(B\hgcmd{revert}$B$O(B @@ -343,7 +343,7 @@ %still removed! This is counter-intuitive (at least to me), but at %least it's easy to deal with. %So remember, to revert a \hgcmd{rename}, you must provide \emph{both} -%the source and destination names. +%the source and destination names. \hgcmd{rename}$B$7$?8e$G$O!$>/$7N10U$7$F$*$/$Y$-E@$,$"$k!%%j%M!<%`8e$K(B \hgcmd{revert}$B$7$?>l9g!$$3$3$G@bL@$9$k$h$&$K!$%j%M!<%`$7$?%U%!%$%k$NL>A0(B @@ -364,7 +364,7 @@ %renamed-from file, don't forget to copy them over.) $B!J0lJ}!$%j%M!<%`$7$?8e$K%j%M!<%`@h$N%U%!%$%k$rJT=8$7!$%j%M!<%`$NA08e$N%U%!(B -$B%$%kL>$r;XDj$7$F<h$j>C$7$r9T$J$$!$(BMercurial$B$,%j%M!<%`$N:]$K>C5n$5$l$?%U%!(B +$B%$%kL>$r;XDj$7$F<h$j>C$7$r9T$$!$(BMercurial$B$,%j%M!<%`$N:]$K>C5n$5$l$?%U%!(B $B%$%k$r=$I|$9$k$H!$$3$N%U%!%$%k$OJT=8A0$N>uBV$K$J$C$F$$$k!%%j%M!<%`8e$N%U%!(B $B%$%k$X$NJQ99$,%j%M!<%`A0$N%U%!%$%k$K;D$k$h$&$K$9$k$K$O!$%3%T!<$r:n$C$F$*(B $B$/I,MW$,$"$k!%!K(B @@ -385,8 +385,8 @@ %automatically, and building blocks that let you reverse part of a %changeset by hand. -$a$$B$r%3%_%C%H$7$?8e$GJL$N(B$b$$B$r%3%_%C%H$7!$$3$3$G(B$a$$B$O8m$j$G$"$k$3$H$K5$$E(B -$B$/$$$?>l9g$r9M$($k!%(BMercurial$B$O%A%'%s%8%;%C%HA4BN$H%A%'%s%8%;%C%H$N0lItJ,(B +$a$$B$r%3%_%C%H$7$?8e$GJL$N(B$b$$B$r%3%_%C%H$7!$$3$3$G(B$a$$B$O8m$j$G$"$k$3$H$K5$$,(B +$B$D$$$?>l9g$r9M$($k!%(BMercurial$B$O%A%'%s%8%;%C%HA4BN$H%A%'%s%8%;%C%H$N0lItJ,(B $B$r<j$G%P%C%/%"%&%H$9$k$h$&$KB%$9!%(B %Before you read this section, here's something to keep in mind: the @@ -397,7 +397,7 @@ %section~\ref{sec:undo:aaaiiieee}. $B$3$N@a$rFI$`A0$K!$(B\hgcmd{backout}$B%3%^%s%I$OMzNr$K(B\emph{$BDI2C(B}$B$9$k$3$H$G<h(B -$B$j>C$7A`:n$r9T$J$&$3$H$r3P$($F$*$$$FM_$7$$!%JQ99$d>C5n$G$O$J$$!%%P%0$N=$(B +$B$j>C$7A`:n$r9T$&$3$H$r3P$($F$*$$$FM_$7$$!%JQ99$d>C5n$G$O$J$$!%%P%0$N=$(B $B@5$N$?$a$KLrN)$D%D!<%k$@$,!$JQ99$N<h$j>C$7$N$?$a$KMQ$$$k$HGKLGE*$J7k2L$r(B $B$b$?$i$9!%8e<T$NL\E*$N$?$a$K$O(B\ref{sec:undo:aaaiiieee}$B$r;2>H$N$3$H!%(B @@ -413,7 +413,7 @@ \hgcmd{backout}$B%3%^%s%I$O%A%'%s%8%;%C%HA4BN$N:nMQ$rBG$A>C$9!%(BMercurial$B$N(B $BMzNr$OITJQ$J$N$G!$$3$N%3%^%s%I$O<h$j>C$7$?$$%A%'%s%8%;%C%H$r<h$j=|$/$b$N(B $B$G$O(B\emph{$B$J$$(B}$B!%$=$NBe$o$j!$<h$j=|$-$?$$%A%'%s%8%;%C%H$N(B\emph{$B5U(B}$B$NF/$-(B -$B$N?7$?$J%A%'%s%8%;%C%H$r$r@8@.$9$k!%(B +$B$N?7$?$J%A%'%s%8%;%C%H$r@8@.$9$k!%(B %The operation of the \hgcmd{backout} command is a little intricate, so %let's illustrate it with some examples. First, we'll create a @@ -482,7 +482,7 @@ $B:G8e$N%3%_%C%H0J30$NJQ99$r%P%C%/%"%&%H$7$?$$;~$O!$(B \hgcmd{backout}$B$K(B\hgopt{backout}{--merge}$B%*%W%7%g%s$rIU$1$k!%(B \interaction{backout.non-tip.clone} -$B$3$N%*%W%7%g%s$O$I$s$J%A%'%s%8%;%C%H$G$b0l2s$NF0:n$G9T$J$&$3$H$,$G$-!$<j(B +$B$3$N%*%W%7%g%s$O$I$s$J%A%'%s%8%;%C%H$G$b0l2s$NF0:n$G9T$&$3$H$,$G$-!$<j(B $BAa$/4JC1$G$"$k!%(B \interaction{backout.non-tip.backout} @@ -505,11 +505,11 @@ %working directory, and commits the result of the merge. $B?^(B\ref{fig:undo:backout-non-tip}$B$G<($5$l$?MzNr$G!$(BMercurial$B$O(B2$B$D$N%3%_%C(B -$B%H$r9T$J$C$F$$$k!%!J?^Cf$GH"$G<($5$l$?@aE@$O(BMercurial$B$,<+F0E*$K%3%_%C%H$7(B +$B%H$r9T$C$F$$$k!%!J?^Cf$GH"$G<($5$l$?@aE@$O(BMercurial$B$,<+F0E*$K%3%_%C%H$7(B $B$?JQ99$G$"$k!%!K%P%C%/%"%&%H%W%m%;%9$NA0$K(BMercurial$B$O!$8=:_$N%o!<%-%s%0%G%#(B $B%l%/%H%j$N?F$,2?$G$"$k$+$r5-21$9$k!%$=$7$F%?!<%2%C%H$N%A%'%s%8%;%C%H$r<h(B $B$j=|$-!$$3$l$r%A%'%s%8%;%C%H$H$7$F%3%_%C%H$9$k!%:G8e$K%o!<%-%s%0%G%#%l%/(B -$B%H%j$NA0$N?F$X%^!<%8$r9T$J$$!$%^!<%8$N7k2L$r%3%_%C%H$9$k!%(B +$B%H%j$NA0$N?F$X%^!<%8$r9T$$!$%^!<%8$N7k2L$r%3%_%C%H$9$k!%(B \begin{figure}[htb] \centering @@ -679,12 +679,12 @@ \begin{enumerate} \item $B%o!<%-%s%0%G%#%l%/%H%j$,%/%j!<%s$G$"$k$3$H$r3NG'$9$k!%(Bi.e.\hgcmd{status} $B$,6u$G$"$k$3$H$r3NG'$9$k(B - \item $B8=:_$N%o!<%-%s%0%G%#%l%/%H%j$N?F$r5-21$9$k$3$N%A%'%s%8%;%C%H$r(B + \item $B8=:_$N%o!<%-%s%0%G%#%l%/%H%j$N?F$r5-21$9$k!%$3$N%A%'%s%8%;%C%H$r(B \texttt{orig}$B$H8F$V$3$H$K$9$k!%(B \item $B%o!<%-%s%0%G%#%l%/%H%j$r!$%P%C%/%"%&%H$7$?%A%'%s%8%;%C%H$NFbMF$K(B - $B$9$k$?$a$K(B\hgcmd{update}$B$HEy2A$JF0:n$r9T$J$&!%$3$N%A%'%s%8%;%C%H(B + $B$9$k$?$a$K(B\hgcmd{update}$B$HEy2A$JF0:n$r9T$&!%$3$N%A%'%s%8%;%C%H(B $B$r(B\texttt{backout}$B$H8F$V!%(B - \item $B$=$N%A%'%s%8%;%C%H$N?F$r8+$D$1=P$9$3$N%A%'%s%8%;%C%H$r(B + \item $B$=$N%A%'%s%8%;%C%H$N?F$r8+$D$1=P$9!%$3$N%A%'%s%8%;%C%H$r(B \texttt{parent}$B$H8F$V$3$H$K$9$k!%(B \item \texttt{backout}$B%A%'%s%8%;%C%H$,1F6A$9$k3F!9$N%U%!%$%k$KBP$7$F!$(B \hgcmdargs{revert}{-r parent}$B$HEy2A$JA`:n$r9T$$!$%A%'%s%8%;%C%H$,(B @@ -692,7 +692,7 @@ \item $B?7$7$$%A%'%s%8%;%C%H$N7k2L$r%3%_%C%H$9$k!%$3$N%A%'%s%8%;%C%H$O(B \texttt{backout}$B$r?F$K;}$D!%(B \item \hgopt{backout}{--merge}$B$r%3%^%s%I%i%$%s$+$iF~NO$7$?>l9g!$(B - \texttt{orig}$B$H$N%^!<%8$r9T$J$$!$7k2L$r%3%_%C%H$9$k!%(B + \texttt{orig}$B$H$N%^!<%8$r9T$$!$7k2L$r%3%_%C%H$9$k!%(B \end{enumerate} %An alternative way to implement the \hgcmd{backout} command would be @@ -703,7 +703,7 @@ %well. \hgcmd{backout}$B%3%^%s%I$r<BAu$9$kJL$NJ}K!$H$7$F!$(B\hgcmd{export}$B$G%P%C%/%"(B -$B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r(Bdiff$B$H$7$F=PNO$7!$(B +$B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r:9J,$H$7$F=PNO$7!$(B \command{patch}$B$r(B\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B $B%0%G%#%l%/%H%j$NA`:n$r>JN,$7$F%j%P!<%9%Q%C%A$9$kJ}K!$,9M$($i$l$k!%(B $B$3$NJ}K!$O$:$C$HC1=c$@$,!$$[$H$s$I$&$^$/F0$+$J$$!%(B @@ -713,7 +713,7 @@ %good job when dealing with all the changes \emph{between} the change %you're backing out and the current tip. -\hgcmd{backout}$B$,%"%C%W%G!<%H!$%3%_%C%H!$%^!<%8!$%3%_%C%H$r9T$J$&M}M3$O!$(B +\hgcmd{backout}$B$,%"%C%W%G!<%H!$%3%_%C%H!$%^!<%8!$%3%_%C%H$r9T$&M}M3$O!$(B $B%P%C%/%"%&%H$9$Y$-JQ99$H8=:_$N%A%C%W$N4V$G!$%^!<%85!9=$,:G$bNI$$7k2L$rF@(B $B$i$l$k$h$&$K$9$k$?$a$G$"$k!%(B @@ -784,7 +784,7 @@ Mercurial$B$OMzNr$rN_@QE*$J$b$N$H$7$F07$&!%A4$F$NJQ99$O$=$l$K@hN)$DA4$F$NJQ(B $B99$N>e$K$J$j$?$C$F$$$k!%0lHLE*$K8@$C$FGK2uE*$JJQ99$r2sHr$9$k$3$H$O$G$-$J(B -$B$$!%$?$C$?0l$D$NNc30$O%3%_%C%H$r9T$J$C$?D>8e$G!$B>$N%j%]%8%H%j$K%W%C%7%e(B +$B$$!%$?$C$?0l$D$NNc30$O%3%_%C%H$r9T$C$?D>8e$G!$B>$N%j%]%8%H%j$K%W%C%7%e(B $B$b%W%k$b$5$l$F$$$J$$>l9g$G$"$k!%$=$N>l9g!$(B\ref{sec:undo:rollback}$B$N%;%/%7%g(B $B%s$G>\$7$/?($l$?$h$&$K!$0BA4$K(B\hgcmd{rollback}$B$r<B9T$9$k$3$H$,$G$-$k!%(B @@ -794,11 +794,10 @@ %still be present in the remote repository, so it will reappear in your %local repository the next time you pull. -$B4V0c$C$?JQ99$rB>$N%j%]%8%H%j$K%W%C%7%e$7$?8e$G$b%m!<%+(B -$B%k%3%T!<$NJQ99$r<h$j>C$9$?$a$K0MA3$H$7$F(B\hgcmd{rollback}$B$r;H$&$3$H$,(B -\emph{$B$G$-$k(B}$B$,!$$3$l$O0U?^$7$?$h$&$J7k2L$K$O$J$i$J$$!%JQ99$O0MA3$H$7$F(B -$B%j%b!<%H$N%j%]%8%H%j$K$O$=$s$6$$$7$F$*$j!$<!$K%W%k$7$?;~$K$O%m!<%+%k%j%](B -$B%8%H%j$K$b8=$l$k!%(B +$B4V0c$C$?JQ99$rB>$N%j%]%8%H%j$K%W%C%7%e$7$?8e$G$b%m!<%+%k%3%T!<$NJQ99$r<h(B +$B$j>C$9$?$a$K0MA3$H$7$F(B\hgcmd{rollback}$B$r;H$&$3$H$,(B\emph{$B$G$-$k(B}$B$,!$$3$l$O(B +$B0U?^$7$?$h$&$J7k2L$K$O$J$i$J$$!%JQ99$O0MA3$H$7$F%j%b!<%H$N%j%]%8%H%j$K$O(B +$BB8:_$7$F$*$j!$<!$K%W%k$7$?;~$K$O%m!<%+%k%j%]%8%H%j$K$b8=$l$k!%(B %If a situation like this arises, and you know which repositories your %bad change has propagated into, you can \emph{try} to get rid of the @@ -810,7 +809,7 @@ $B$3$N$h$&$J>u67$K$J$C$?;~!$$b$7$I$N%j%]%8%H%j$K$3$N4V0c$C$?JQ99$,GH5Z$7$F(B $B$$$k$N$+$,L@$i$+$G$"$l$P!$$=$l$i$N%j%]%8%H%j$N0l$D0l$D$+$i!$JQ99$r<h$j=|(B $B$/$3$H$r;n$_$k$3$H$,$G$-$k!%$3$l$O$b$A$m$sK~B-$N$$$/2r7hK!$G$O$J$$!%$b$7(B -$B0l$D$G$b>C5n$rK:$l$l$P!$JQ99$OLnJ|$7$K$J$C$F$*$j!$$5$i$K3H$,$jF@$k!%(B +$B0l$D$G$b>C5n$rK:$l$l$P!$JQ99$OLnJ|$7$K$J$C$F$*$j!$$5$i$K9-$,$j$&$k!%(B %If you've committed one or more changes \emph{after} the change that %you'd like to see disappear, your options are further reduced. @@ -841,7 +840,7 @@ $B%m!<%+%k%j%]%8%H%j$K$$$/$D$+$NJQ99$r%3%_%C%H$7!$$=$l$i$,JL$N=j$K%W%C%7%e(B $B$^$?$O%W%k$5$l$F$$$F!$I,$:$7$bBg:R32$H$O8@$($J$$!%$"$J$?$O$$$/$D$+$N%/%i(B -$B%9$N4V0c$C$?JQ99$+$i<+J,<+?H$G$_$r<i$k$3$H$,$G$-$k!%$3$l$O$"$J$?$N%A!<%`(B +$B%9$N4V0c$C$?JQ99$+$i<+J,<+?H$G?H$r<i$k$3$H$,$G$-$k!%$3$l$O$"$J$?$N%A!<%`(B $B$,Cf1{$N%j%]%8%H%j$+$iJQ99$r%W%k$7$F$$$k>l9g$OFC$K4JC1$G$"$k!%(B %By configuring some hooks on that repository to validate incoming @@ -854,10 +853,9 @@ $BCf1{%j%]%8%H%j$N>e$G!$JQ99E~Ce$K%U%C%/$r@_Dj$9$k!J(B\ref{chap:hook}$B$r;2>H!K(B $B$3$H$G!$$"$k<o$N8m$C$?%A%'%s%8%;%C%H$,Cf1{%j%]%8%H%j$K%3%_%C%H$5$l$k$N$r(B -$B<+F0E*$KKI$0$3$H$,$G$-$k!%(B -$B$=$N$h$&$J@_Dj$r9T$&$3$H$G!$$"$k<o$N8m$C$?%A%'%s%8%;%C%H$O%;%s%H%i%k%j%](B -$B%8%H%j$KGH5Z$9$k$3$H$,$G$-$:!$;`LG$7$F$$$/798~$,$"$k!%$5$i$KNI$$$3$H$H$7(B -$B$F$O!$$3$l$OL@<(E*$K2pF~$;$:$KH/@8$5$;$k$3$H$,$G$-$k$3$H$,$"$k!%(B +$B<+F0E*$KKI$0$3$H$,$G$-$k!%$=$N$h$&$J@_Dj$r9T$&$3$H$G!$$"$k<o$N8m$C$?%A%'(B +$B%s%8%;%C%H$OCf1{%j%]%8%H%j$KGH5Z$9$k$3$H$,$G$-$:!$;`LG$7$F$$$/798~$,$"(B +$B$k!%9%ET9g$J$3$H$K!$;`LG$OM[$K2pF~$9$kI,MW$J$/5/$-$k!#(B %For instance, an incoming change hook that verifies that a changeset %will actually compile can prevent people from inadvertantly ``breaking @@ -919,7 +917,7 @@ $B0J2<$O$3$N%3%^%s%I$r$I$N$h$&$KE,MQ$G$-$k$N$+M}2r$r=u$1$k%7%J%j%*$G$"$k!%(B \begin{itemize} \item $B%P%0$,5/$-$F$$$J$+$C$?:G$b?7$7$$%P!<%8%g%s$r3P$($F$$$k$,!$$I$N%P!<(B - $B%8%g%s$G%P%0$,:.F~$7$?$+J,$+$i$J$$!%$3$3$G%P%$%J%j%F%9%H$r9T$J$$!$(B + $B%8%g%s$G%P%0$,:.F~$7$?$+J,$+$i$J$$!%$3$3$G%P%$%J%j%F%9%H$r9T$$!$(B $B%P%0$NB8:_$rD4$Y$k!%(B \item $B%P%0$rBg5^$.$G=$@5$7!$$"$J$?$N%A!<%`$N%P%0%G!<%?%Y!<%9$r%/%m!<%:(B $B$9$k!%%P%0%G!<%?%Y!<%9$O$I$3$G%P%0$,=$@5$5$l$?$+$N%A%'%s%8%;%C%H(B @@ -939,15 +937,15 @@ %that you can't find from a simple text search of the files in the %tree) for which you can write a binary test. -$B$3$NNc$+$i!$(B\hgcmd{bisect}$B%3%^%s%I$O%P%0$N$"$j$+$rC5$9$N$KLrN)$D$N$G$O$J(B -$B$$$3$H$,J,$+$k$@$m$&!%$3$N%3%^%s%I$O%P%$%J%j%F%9%H$r9T$J$$F@$k%j%]%8%H%j(B -$B$G5/$-$?!JC1=c$K%D%j!<$r%F%-%9%H%5!<%A$7$?$N$G$OH/8+$G$-$J$$!KJQ2=A4$F$r(B -$BCN$k$N$K;H$&$3$H$,$G$-$k!%(B +$B$3$NNc$+$i!$(B\hgcmd{bisect}$B%3%^%s%I$OC1$K%P%0$N=j:_$rC5$9$N$KLrN)$D$@$1$G(B +$B$O$J$/!"%P%$%J%j%F%9%H$rMQ0U$G$-$k$N$G$"$l$P!"%j%]%8%H%j$G5/$-$?$"$i$f$k(B +$BJQ2=!JC1$K%D%j!<$r%F%-%9%H%5!<%A$7$?$N$G$OH/8+$G$-$J$$JQ2=!K$rCN$k$N$K;H(B +$B$($k$3$H$,$o$+$k!#(B %We'll introduce a little bit of terminology here, just to make it %clear which parts of the search process are your responsibility, and %which are Mercurial's. A \emph{test} is something that \emph{you} run -%when \hgcmd{bisect} chooses a changeset.A \emph{probe} is what +%when \hgcmd{bisect} chooses a changeset. A \emph{probe} is what %\hgcmd{bisect} runs to tell whether a revision is good. Finally, %we'll use the word ``bisect'', as both a noun and a verb, to stand in %for the phrase ``search using the \hgcmd{bisect} command''. @@ -968,13 +966,13 @@ %and limited your search to those, you'd still be looking at over 40 %hours to find the changeset that introduced your bug. -$B%5!<%A%W%m%;%9$r<+F02=$9$k$?$s$s=_OBJ}K!$O!$A4$F$N%A%'%s%8%;%C%H$r(Bprobe -$B$9$k$3$H$G$"$k!%$7$+$7$3$l$OKX$s$I%9%1!<%k$7$J$$!%0l$D$N%A%'%s%8%;%C%H$N(B -$B%A%'%C%/$K(B10$BJ,$+$+$j!$%j%]%8%H%j$K%A%'%s%8%;%C%H$,(B10000$B$"$C$?$H$7$?$i!$iM(B -$BDY$7$N%"%W%m!<%A$O%P%0$rH/@8$5$;$?%A%'%s%8%;%C%H$NFCDj$KJ?6Q$G(B35$BF|$+$+$k!%(B -$B%P%0$,:G8e$N(B500$B%A%'%s%8%;%C%H$GH/@8$7$?$3$H$,J,$+$C$F$$$F!$%5!<%A$r$=$l$i(B -$B$N%A%'%s%8%;%C%H$K8BDj$7$?$H$7$F$b!$%P%0$r0z$-5/$3$7$?%A%'%s%8%;%C%H$NFC(B -$BDj$K(B40$B;~4V0J>e$+$+$k!%(B +$B%5!<%A%W%m%;%9$r<+F02=$9$kC1=c$JJ}K!$O!$A4$F$N%A%'%s%8%;%C%H$r(Bprobe$B$9$k$3(B +$B$H$G$"$k!%$7$+$7$3$l$OKX$s$I%9%1!<%k$7$J$$!%0l$D$N%A%'%s%8%;%C%H$N%A%'%C(B +$B%/$K(B10$BJ,$+$+$j!$%j%]%8%H%j$K%A%'%s%8%;%C%H$,(B10000$B$"$C$?$H$7$?$i!$iMDY$7$N(B +$B%"%W%m!<%A$O%P%0$rH/@8$5$;$?%A%'%s%8%;%C%H$NFCDj$KJ?6Q$G(B35$BF|$+$+$k!%%P%0(B +$B$,:G8e$N(B500$B%A%'%s%8%;%C%H$GH/@8$7$?$3$H$,J,$+$C$F$$$F!$%5!<%A$r$=$l$i$N%A%'(B +$B%s%8%;%C%H$K8BDj$7$?$H$7$F$b!$%P%0$r0z$-5/$3$7$?%A%'%s%8%;%C%H$NFCDj$K(B40 +$B;~4V0J>e$+$+$k!%(B %What the \hgcmd{bisect} command does is use its knowledge of the %``shape'' of your project's revision history to perform a search in @@ -989,9 +987,9 @@ \hgcmd{bisect}$B$O$"$J$?$N%W%m%8%'%/%H$N%j%S%8%g%sMzNr$N(B``$B%7%'%$%W(B''$B$NCN<1(B $B$r!$%5!<%A$9$Y$-%A%'%s%8%;%C%H?t$N(B\emph{$BBP?t(B}$B$KHfNc$7$?;~4V$G%5!<%A$9$k$?(B -$B$a$K;H$&!%!JFsJ,8!:w$r9T$J$&!%!K$3$N%"%W%m!<%A$K$h$C$F(B10000$B%A%'%s%8%;%C%H(B +$B$a$K;H$&!%!JFsJ,C5:w$r9T$&!%!K$3$N%"%W%m!<%A$K$h$C$F(B10000$B%A%'%s%8%;%C%H(B $B$N%5!<%A$O!$3F!9$N%5!<%A$,(B10$BJ,$+$+$C$?$H$7$F$b!$%F%9%H?t$O(B14$B$G(B3$B;~4V0J2<$G(B -$B=*N;$9$k!%:G8e$N(B100$B$N%A%'%s%8%;%C%H$K8B$C$F9T$J$C$?$H$9$k$H!$$*$h$=(B7$B2s$N(B +$B=*N;$9$k!%:G8e$N(B100$B$N%A%'%s%8%;%C%H$K8B$C$F9T$C$?$H$9$k$H!$$*$h$=(B7$B2s$N(B $B%F%9%H$G(B1$B;~4VDxEY$G=*N;$9$k!%(B %The \hgcmd{bisect} command is aware of the ``branchy'' nature of a @@ -1181,7 +1179,7 @@ 40$B8D$N%A%'%s%8%;%C%H$,$"$k$K$b$+$+$o$i$:!$(B\hgcmd{bisect}$B%3%^%s%I$O%P%0$r(B $B$b$?$i$7$?%A%'%s%8%;%C%H$r(B5$B2s$N%F%9%H$GH/8+$9$k$3$H$,$G$-$?!%(B \hgcmd{bisect}$B$N%F%9%H2s?t$OC5:w$9$Y$-%A%'%s%8%;%C%H?t$,A}$($k$K=>$C$F!$(B -$BBP?tE($KA}$($k$,!$iMDY$7C5:w$KBP$9$kM%0L@-$O!$%A%'%s%8%;%C%H$,A}2C$9$k$K(B +$BBP?tE*$KA}$($k$,!$iMDY$7C5:w$KBP$9$kM%0L@-$O!$%A%'%s%8%;%C%H$,A}2C$9$k$K(B $B=>$C$FA}2C$9$k!%(B @@ -1208,7 +1206,7 @@ \section{$B8zN(E*$J%P%0$NH/8+K!(B} %\subsection{Give consistent input} -\subsection{$B0l4S$7$?F~NO$r9T$&(B} +\subsection{$B@5$7$$F~NO$r9T$&(B} %The \hgcmd{bisect} command requires that you correctly report the %result of every test you perform. If you tell it that a test failed @@ -1219,10 +1217,10 @@ %the wrong changeset as the source of the bug. \hgcmd{bisect}$B%3%^%s%I$O3F%F%9%H$G@5$7$/7k2L$rF~NO$9$k$3$H$,I,MW$G$"$k!%(B -$B$b$7%F%9%H$K@.8y$7$?$N$K<:GT$HF~NO$9$k$P!$ITDj$J>uBV$r8!CN$9$k$+$b$7$l$J(B -$B$$!%F~NO$NCf$GITDj$rFCDj$G$-$l$P!$%3%^%s%I$OFCDj$N%A%'%s%8%;%C%H$,(Bgood$B$+(B -$B$D(Bbad$B$G$"$k$HI=<($9$k!%$7$+$740`z$K$3$l$r9T$&$3$H$OIT2DG=$G!$4V0c$C$?%A%'(B -$B%s%8%;%C%H$r%P%0$N860x$@$HJs9p$9$k2DG=@-$,9b$$!%(B +$B$b$7%F%9%H$K@.8y$7$?$N$K<:GT$HF~NO$9$l$P!$L7=b$,@8$8$&$k!%F~NO$NCf$KL7=b(B +$B$,$"$k$3$H$,J,$+$l$P!$%3%^%s%I$OFCDj$N%A%'%s%8%;%C%H$r(Bgood$B$+$D(Bbad$B$HI=<($9(B +$B$k!%$7$+$7L7=b$r40`z$K8+$D$1=P$9$3$H$O:$Fq$G!$8m$C$?%A%'%s%8%;%C%H$r%P%0(B +$B$N5/8;$HJs9p$9$k2DG=@-$,9b$$!%(B %\subsection{Automate as much as possible} \subsection{$B$G$-$k8B$j<+F02=$9$k(B} @@ -1350,10 +1348,9 @@ %hence untestable state at that revision, perhaps because someone %checked in a change that prevented the project from building. -\hgcmdargs{bisect}{--skip}$B$N;HMQ$,M-MQ$J$b$&0l$DJL$N>u67$O!$C/$+$,%S%k%I(B -$B$G$-$J$/$J$k$h$&$JJQ99$r%A%'%C%/%$%s$7$?$?$a$K!$;n$=$&$H$7$F$$$k%j%S%8%g(B -$B%s$,%S%k%I$G$-$:!$$=$N%j%S%8%g%s$r%F%9%H$G$-$J$$$h$&$J>l9g$G$"$k!%(B - +\hgcmdargs{bisect}{--skip}$B$,M-8z$JJL$NNc$H$7$F!$%S%k%IITG=$K$J$kJQ99$,(B +$B%A%'%C%/%$%s$5$l$?%j%S%8%g%s$,$"$j!$$3$l$rHt$P$5$J$1$l$P%F%9%H$,$G$-$J$$(B +$B$h$&$J>u67$,$"$k!%(B %\subsection{Bracket your search lazily} \subsection{$BC5:w$rBUBF$K%V%i%1%C%H$9$k(B}