comparison 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
comparison
equal deleted inserted replaced
834:896ab6eaf1c6 835:8a3041e6f3cb
17 %maintained by a small team of developers. 17 %maintained by a small team of developers.
18 18
19 $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 19 $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
20 $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 20 $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
21 $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 21 $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
22 $B<T$N%A!<%`$K$h$C$F$$;~4IM}$5$l$F$$$k!%(B 22 $B<T$N%A!<%`$K$h$C$F0];}4IM}$5$l$F$$$k!%(B
23 23
24 %While much of the material in this chapter is specific to Linux, the 24 %While much of the material in this chapter is specific to Linux, the
25 %same principles apply to any code base for which you're not the 25 %same principles apply to any code base for which you're not the
26 %primary owner, and upon which you need to do a lot of development. 26 %primary owner, and upon which you need to do a lot of development.
27 27
161 %create a simple repository for experimenting in. 161 %create a simple repository for experimenting in.
162 %\interaction{mq.guards.init} 162 %\interaction{mq.guards.init}
163 %This gives us a tiny repository that contains two patches that don't 163 %This gives us a tiny repository that contains two patches that don't
164 %have any dependencies on each other, because they touch different files. 164 %have any dependencies on each other, because they touch different files.
165 165
166 $BB?$/$N%?!<%2%C%H$rBP>]$H$7$J$,$i@5>o$KJ]$D0lHVNI$$J}J}$O!$>u67$K1~$8$FFC(B 166 $BB?$/$N%?!<%2%C%H$rBP>]$H$7$J$,$i@5>o$KJ]$D0lHVNI$$J}K!$O!$>u67$K1~$8$FFC(B
167 $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 167 $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
168 \texttt{guards}$B%3%^%s%I$KN`;w$7$?(B``guards''$B$H8F$P$l$k5!G=$rDs6!$7$F$$$k!%(B 168 \texttt{guards}$B%3%^%s%I$KN`;w$7$?(B``guards''$B$H8F$P$l$k5!G=$rDs6!$7$F$$$k!%(B
169 $B3+;O$KEv$?$C$F!$<B83$N$?$a$KC1=c$J%j%]%8%H%j$r:n@.$9$k!%(B 169 $B3+;O$KEv$?$C$F!$<B83$N$?$a$KC1=c$J%j%]%8%H%j$r:n@.$9$k!%(B
170 \interaction{mq.guards.init} 170 \interaction{mq.guards.init}$B>.$5$J%j%]%8%H%j$r:n$j!$JL!9$N%U%!%$%k$rA`:n(B
171 $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 171 $B$9$k8_$$$K0MB8@-$N$J$$(B2$B$D$N%Q%C%A$rCV$/!%(B
172 $B%A$rCV$/!%(B
173 172
174 %The idea behind conditional application is that you can ``tag'' a 173 %The idea behind conditional application is that you can ``tag'' a
175 %patch with a \emph{guard}, which is simply a text string of your 174 %patch with a \emph{guard}, which is simply a text string of your
176 %choosing, then tell MQ to select specific guards to use when applying 175 %choosing, then tell MQ to select specific guards to use when applying
177 %patches. MQ will then either apply, or skip over, a guarded patch, 176 %patches. MQ will then either apply, or skip over, a guarded patch,
178 %depending on the guards that you have selected. 177 %depending on the guards that you have selected.
179 178
180 $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 179 $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
181 $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 180 $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
182 $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 181 $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
183 $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 182 $B$?$O%9%-%C%W$r!$;XDj$5$l$?%,!<%I$K$h$C$F7hDj$9$k!%(B
184 $BDj$9$k!%(B
185 183
186 %A patch can have an arbitrary number of guards; 184 %A patch can have an arbitrary number of guards;
187 %each one is \emph{positive} (``apply this patch if this guard is 185 %each one is \emph{positive} (``apply this patch if this guard is
188 %selected'') or \emph{negative} (``skip this patch if this guard is 186 %selected'') or \emph{negative} (``skip this patch if this guard is
189 %selected''). A patch with no guards is always applied. 187 %selected''). A patch with no guards is always applied.