Mercurial > hgbook

comparison ja/mq.tex @ 328:8bdd9bc948d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more mq.tex
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Sun, 30 Mar 2008 00:16:13 +0900
parents 7dbc8f2a5f7a
children d520107e32e7
comparison
equal deleted inserted replaced
327:7dbc8f2a5f7a 328:8bdd9bc948d4
51 $B$,B?$$!%(B 51 $B$,B?$$!%(B
52 52
53 When you have few changes to maintain, it is easy to manage a single 53 When you have few changes to maintain, it is easy to manage a single
54 patch using the standard \command{diff} and \command{patch} programs 54 patch using the standard \command{diff} and \command{patch} programs
55 (see section~\ref{sec:mq:patch} for a discussion of these tools). 55 (see section~\ref{sec:mq:patch} for a discussion of these tools).
56
57 Once the number of changes grows, it starts to make sense to maintain 56 Once the number of changes grows, it starts to make sense to maintain
58 patches as discrete ``chunks of work,'' so that for example a single 57 patches as discrete ``chunks of work,'' so that for example a single
59 patch will contain only one bug fix (the patch might modify several 58 patch will contain only one bug fix (the patch might modify several
60 files, but it's doing ``only one thing''), 59 files, but it's doing ``only one thing''),
61 60
62
63 and you may have a number 61 and you may have a number
64 of such patches for different bugs you need fixed and local changes 62 of such patches for different bugs you need fixed and local changes
65 you require. In this situation, if you submit a bug fix patch to the 63 you require.
64
65
66
67 In this situation, if you submit a bug fix patch to the
66 upstream maintainers of a package and they include your fix in a 68 upstream maintainers of a package and they include your fix in a
67 subsequent release, you can simply drop that single patch when you're 69 subsequent release, you can simply drop that single patch when you're
68 updating to the newer release. 70 updating to the newer release.
69 71
70 $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 72 $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
71 \command{patch}$B%3%^%s%I$r;H$C$FC10l$N%Q%C%A$r4IM}$9$k$N$,4JC1$@!%!J$3$l$i(B 73 $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
72 $B$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!K(B 74 $B$l$i$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!K(B
73 75
74 $BJQ99$N?t$,A}$($F$/$k$H!$C10l$N%P%0%U%#%C%/%9$@$1$r4^$`8DJL$N%Q%C%A$N=89g(B 76 $BJQ99$N?t$,A}$($F$/$k$H!$C10l$N%P%0%U%#%C%/%9$@$1$r4^$`8DJL$N%Q%C%A$r=89g(B
75 $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 77 $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
76 $B%k$rJQ99$9$k$+$b$7$l$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K(B 78 $BJQ99$9$k$+$b$7$l$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K(B
79
80 $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
81 $B%A$r;}$D$3$H$K$J$k$+$b$7$l$J$$!%(B
82
83 $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
84 $B$?$N=$@5$r(B
85
86
87
77 88
78 89
79 90
80 Maintaining a single patch against an upstream tree is a little 91 Maintaining a single patch against an upstream tree is a little
81 tedious and error-prone, but not difficult. However, the complexity 92 tedious and error-prone, but not difficult. However, the complexity