Mercurial > hgbook
diff ja/mq.tex @ 328:8bdd9bc948d4
more mq.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sun, 30 Mar 2008 00:16:13 +0900 |
parents | 7dbc8f2a5f7a |
children | d520107e32e7 |
line wrap: on
line diff
--- a/ja/mq.tex Sat Mar 29 05:30:34 2008 +0900 +++ b/ja/mq.tex Sun Mar 30 00:16:13 2008 +0900 @@ -53,27 +53,38 @@ When you have few changes to maintain, it is easy to manage a single patch using the standard \command{diff} and \command{patch} programs (see section~\ref{sec:mq:patch} for a discussion of these tools). - Once the number of changes grows, it starts to make sense to maintain patches as discrete ``chunks of work,'' so that for example a single patch will contain only one bug fix (the patch might modify several files, but it's doing ``only one thing''), - and you may have a number of such patches for different bugs you need fixed and local changes -you require. In this situation, if you submit a bug fix patch to the +you require. + + + +In this situation, if you submit a bug fix patch to the upstream maintainers of a package and they include your fix in a subsequent release, you can simply drop that single patch when you're updating to the newer release. -$B$b$7%a%s%F%J%s%9$7$F$$$kJQ99$,$o$:$+$J$i!$I8=`$N(B\command{diff}$B%3%^%s%I$H(B -\command{patch}$B%3%^%s%I$r;H$C$FC10l$N%Q%C%A$r4IM}$9$k$N$,4JC1$@!%!J$3$l$i(B -$B$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!K(B +$B$b$7%a%s%F%J%s%9$7$F$$$kJQ99$,$4$/$o$:$+$J$i!$I8=`$N(B\command{diff}$B%3%^%s(B +$B%I$H(B\command{patch}$B%3%^%s%I$r;H$C$FC10l$N%Q%C%A$r4IM}$9$k$N$,4JC1$@!%!J$3(B +$B$l$i$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!K(B + +$BJQ99$N?t$,A}$($F$/$k$H!$C10l$N%P%0%U%#%C%/%9$@$1$r4^$`8DJL$N%Q%C%A$r=89g(B +$B$H$7$F4IM}$9$k$3$H$,8=<BL#$rBS$S$F$/$k!%!J3F!9$N%Q%C%A$OJ#?t$N%U%!%$%k$r(B +$BJQ99$9$k$+$b$7$l$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K(B -$BJQ99$N?t$,A}$($F$/$k$H!$C10l$N%P%0%U%#%C%/%9$@$1$r4^$`8DJL$N%Q%C%A$N=89g(B -$B$H$7$F4IM}$9$k$3$H$,8=<BL#$rBS$S$F$/$k!%!J$=$l$>$l$N%Q%C%A$OJ#?t$N%U%!%$(B -$B%k$rJQ99$9$k$+$b$7$l$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K(B +$B=$@5$7$?$$0[$J$k%P%0$HI,MW$J%m!<%+%k$JJQ99$N$?$a$N!$?tB?$/$N$=$N$h$&$J%Q%C(B +$B%A$r;}$D$3$H$K$J$k$+$b$7$l$J$$!%(B + +$B$3$N>u67$G$O%"%C%W%9%H%j!<%`$N%a%s%F%J$K%P%0=$@5%Q%C%A$rAw$j!$H`$i$,$"$J(B +$B$?$N=$@5$r(B + + +