Mercurial > hgbook
diff ja/mq-collab.tex @ 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 11 Jul 2009 19:25:35 +0900 |
parents | b96d7f6504e5 |
children |
line wrap: on
line diff
--- 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