annotate ja/mq.tex @ 838:d1f676a6a4b3 default tip

update mq chapter. propagate ef53d025f410.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 03 Dec 2009 01:26:08 +0900
parents 8a3041e6f3cb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1 %\chapter{Managing change with Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
2 \chapter{Mercurial Queues$B$GJQ99$r4IM}$9$k(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 \label{chap:mq}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
5 %\section{The patch management problem}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
6 \section{$B%Q%C%A4IM}$NLdBj(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 \label{sec:mq:patch-mgmt}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
9 %Here is a common scenario: you need to install a software package from
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
10 %source, but you find a bug that you must fix in the source before you
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
11 %can start using the package. You make your changes, forget about the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
12 %package for a while, and a few months later you need to upgrade to a
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
13 %newer version of the package. If the newer version of the package
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
14 %still has the bug, you must extract your fix from the older source
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
15 %tree and apply it against the newer version. This is a tedious task,
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
16 %and it's easy to make mistakes.
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
17
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
18 $B$h$/$"$k%7%J%j%*!'%=!<%9$+$i%=%U%H%&%'%"%Q%C%1!<%8$r%$%s%9%H!<%k$9$kI,MW(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
19 $B$,$"$k!%$7$+$7%Q%C%1!<%8$r;H$&A0$K%=!<%9$+$iD>$9$Y$-%P%0$r8+$D$1$?!%JQ99(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
20 $B$r2C$($F!$;C$/%Q%C%1!<%8$N$3$H$OK:$l$F$$$k!%?t%v7n8e!$?7$7$$%P!<%8%g%s$r(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
21 $B%$%s%9%H!<%k$9$k$3$H$K$J$C$?!%$b$7?7$7$$%P!<%8%g%s$,!$0MA3$H$7$F$=$N%P%0(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
22 $B$r;}$C$F$$$?>l9g!$=$@5$r8E$$%=!<%9$+$iCj=P$7$F!$?7$7$$%P!<%8%g%s$KE,MQ$7(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
23 $B$J$1$l$P$J$i$J$$!%$3$l$OB`6~$G$7$+$b4V0c$$$d$9$$;E;v$@!%(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
24
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
25 %This is a simple case of the ``patch management'' problem. You have
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
26 %an ``upstream'' source tree that you can't change; you need to make
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
27 %some local changes on top of the upstream tree; and you'd like to be
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
28 %able to keep those changes separate, so that you can apply them to
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
29 %newer versions of the upstream source.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
30
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
31 $B$3$l$,%Q%C%A4IM}LdBj$N%7%s%W%k$JNc$G$"$k!%$b$7$"$J$?$,JQ99$G$-$J$$>eN.$N(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
32 $B%=!<%9%D%j!<$,$"$l$P!$%"%C%W%9%H%j!<%`$N%D%j!<$N>e$G%m!<%+%k$JJQ99$r$7$J(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
33 $B$1$l$P$J$i$J$$!%$"$J$?$O%"%C%W%9%H%j!<%`%=!<%9$KE,MQ$G$-$k$h$&$K$-$C$H$3(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
34 $B$NJQ99$rJ,N%$7$F$*$-$?$$$H;W$&$O$:$@!%(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
35
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
36 %The patch management problem arises in many situations. Probably the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
37 %most visible is that a user of an open source software project will
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
38 %contribute a bug fix or new feature to the project's maintainers in the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
39 %form of a patch.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
40
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
41 $B%Q%C%A4IM}LdBj$O$$$m$$$m$J>u67$G5/$3$k!%$*$=$i$/:G$bL@$i$+$J$N$O!$%*!<%W(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
42 $B%s%=!<%9%=%U%H%&%'%"%W%m%8%'%/%H$N%f!<%6$,!$%W%m%8%'%/%H$N%a%s%F%J$K%P%0(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
43 $B%U%#%C%/%9$d?75!G=$r%Q%C%A$N7A$G9W8%$9$k$3$H$G$"$m$&!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
44
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
45 %Distributors of operating systems that include open source software
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
46 %often need to make changes to the packages they distribute so that
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
47 %they will build properly in their environments.
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
48
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
49 $B%*!<%W%s%=%U%H%&%'%"$r4^$`%*%Z%l!<%F%#%s%0%7%9%F%`$NG[I[<T$O!$G[I[$9$k%Q%C(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
50 $B%1!<%8$,H`$i$N4D6-$G@5$7$/%S%k%I$G$-$k$h$&$K%Q%C%1!<%8$XJQ99$r2C$($k$3$H(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
51 $B$,B?$$!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
52
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
53 %When you have few changes to maintain, it is easy to manage a single
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
54 %patch using the standard \command{diff} and \command{patch} programs
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
55 %(see section~\ref{sec:mq:patch} for a discussion of these tools). Once
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
56 %the number of changes grows, it starts to make sense to maintain patches
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
57 %as discrete ``chunks of work,'' so that for example a single patch will
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
58 %contain only one bug fix (the patch might modify several files, but it's
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
59 %doing ``only one thing''), and you may have a number of such patches for
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
60 %different bugs you need fixed and local changes you require. In this
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
61 %situation, if you submit a bug fix patch to the upstream maintainers of
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
62 %a package and they include your fix in a subsequent release, you can
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
63 %simply drop that single patch when you're updating to the newer release.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
64
328
8bdd9bc948d4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 327
diff changeset
65 $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
8bdd9bc948d4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 327
diff changeset
66 $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
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
67 $B$l$i$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!KJQ99$N?t$,A}$($F$/(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
68 $B$k$H!$C10l$N%P%0%U%#%C%/%9$r4^$`8D!9$N%Q%C%A$r0l2t$N=89g$H$7$F4IM}$9$k$3(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
69 $B$H$,8=<BL#$rBS$S$F$/$k!%!J3F!9$N%Q%C%A$OJ#?t$N%U%!%$%k$rJQ99$9$k$+$b$7$l(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
70 $B$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K=$@5$7$?$$%P%0$,$$$/$D$b$"$C$?$j!$%m!<%+%k(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
71 $B$G$NMM!9$JJQ99$NI,MW$N$?$a!$?tB?$/$N$=$N$h$&$J%Q%C%A$r;}$D$3$H$K$J$k$+$b(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
72 $B$7$l$J$$!%$3$N>u67$G!$%"%C%W%9%H%j!<%`$N%a%s%F%J$K%P%0=$@5%Q%C%A$rAw$j!$(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
73 $BH`$i$,$"$J$?$N=$@5$r8e$N%j%j!<%9$K<h$j9~$a$P!$<j85$G?7$7$$%j%j!<%9$K@ZBX(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
74 $B$($?;~$K$OC1=c$K$=$N%Q%C%A$rGK4~$9$l$PNI$$!%(B
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
75
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
76 %Maintaining a single patch against an upstream tree is a little
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
77 %tedious and error-prone, but not difficult. However, the complexity
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
78 %of the problem grows rapidly as the number of patches you have to
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
79 %maintain increases.With more than a tiny number of patches in hand,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
80 %understanding which ones you have applied and maintaining them moves
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
81 %from messy to overwhelming.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
82
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
83 $BC10l$N%Q%C%A$r%"%C%W%9%H%j!<%`$N%D%j!<$KBP$7$F%a%s%F%J%s%9$9$k$3$H$O$d$d(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
84 $BLLE]$G!$4V0c$$$N85$K$J$j$,$A$G$"$k$,!$Fq$7$/$O$J$$!%$7$+$7!$%a%s%F%J%s%9(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
85 $B$9$k%Q%C%A$N?t$,A}$($k$K=>$C$FLdBj$NJ#;($5$,5^B.$KA}$7$F$$$/!%%Q%C%A$N?t(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
86 $B$,$"$kDxEY0J>eB?$/$J$k$H!$$I$N%Q%C%A$rE,MQ$7$?$+!$$I$N%Q%C%A$r4IM}$7$F$$(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
87 $B$k$N$+$NM}2r$,!$Lq2p$H$$$&>uBV$+$i05E]$5$l$k$F$$$k>uBV$K$J$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
88
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
89 %Fortunately, Mercurial includes a powerful extension, Mercurial Queues
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
90 %(or simply ``MQ''), that massively simplifies the patch management
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
91 %problem.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
92
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
93 $B9,$$$K$b!$(BMercurial$B$O(BMercurial Queues$B!J$"$k$$$OC1$K(BMQ$B!K$H$$$&6/NO$J%(%/%9(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
94 $B%F%s%7%g%s$r$b$C$F$*$j!$%Q%C%A4IM}$NLdBj$rBgI}$KC1=c2=$9$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
95
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
96
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
97 %\section{The prehistory of Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
98 \section{Mercurial Queues$BA0;K(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
99 \label{sec:mq:history}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
100
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
101 %During the late 1990s, several Linux kernel developers started to
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
102 %maintain ``patch series'' that modified the behaviour of the Linux
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
103 %kernel. Some of these series were focused on stability, some on
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
104 %feature coverage, and others were more speculative.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
105
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
106 1990$BG/Be$N=*$o$j:"!$(BLinux$B%+!<%M%k$N3+H/<TC#$O!$(BLinux$B%+!<%M%k$r2~A1$9$k0l(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
107 $BO"$N%Q%C%A$N4IM}$r;O$a$?!%$=$l$i$N$&$A!$$"$k$b$N$O0BDj@-$K!$JL$N$b$N$OFC(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
108 $BDj$N5!G=$K!$$^$?JL$N$b$N$OLn?4E*$JFbMF$KFC2=$7$F$$$?!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
109
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
110 %The sizes of these patch series grew rapidly. In 2002, Andrew Morton
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
111 %published some shell scripts he had been using to automate the task of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
112 %managing his patch queues. Andrew was successfully using these
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
113 %scripts to manage hundreds (sometimes thousands) of patches on top of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
114 %the Linux kernel.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
115
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
116 $B$3$l$i$N%Q%C%A%7%j!<%:$N%5%$%:$O$O$9$0$KKD$l>e$,$C$?!%(B2002$BG/$K(BAndrew
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
117 Morton$B$OH`$N%Q%C%A%-%e!<$N4IM}$r<+F02=$9$k$$$/$D$+$N%7%'%k%9%/%j%W%H$r8x(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
118 $BI=$7$?!%(BAndrew$B$O?tI4$+$i?t@i$N(BLinux$B%+!<%M%k%Q%C%A$r$3$l$i$N%9%/%j%W%H$G(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
119 $B4IM}$9$k$3$H$,$G$-$F$$$?!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
120
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
121 %\subsection{A patchwork quilt}
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
122 \subsection{patchwork quilt}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
123 \label{sec:mq:quilt}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
124
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
125 %In early 2003, Andreas Gruenbacher and Martin Quinson borrowed the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
126 %approach of Andrew's scripts and published a tool called ``patchwork
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
127 %quilt''~\cite{web:quilt}, or simply ``quilt''
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
128 %(see~\cite{gruenbacher:2005} for a paper describing it). Because
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
129 %quilt substantially automated patch management, it rapidly gained a
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
130 %large following among open source software developers.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
131
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
132 2003$BG/$N;O$a!$(BAndreas Gruenbacher$B$H(BMartin Quinson$B$O(BAndrew$B$N%9%/%j%W%H$N$d(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
133 $B$jJ}$r??;w$F!$(B``patchwork quilt''~\cite{web:quilt}$B$"$k$$$OC1$K(B``quilt''$B$H(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
134 $B8F$P$l$k%D!<%k$r%j%j!<%9$7$?!%!J>\$7$/$OO@J8(B~\cite{gruenbacher:2005}$B$r;2(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
135 $B>H$N$3$H!%!K(Bquilt$B$O==J,$K<+F02=$5$l$?%Q%C%A4IM}$rDs6!$7$F$$$?$N$G!$%=%U%H(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
136 $B%&%'%"3+H/<T$NBg$-$J;Y;}$r5^B.$K3MF@$7$F$$$C$?!%(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
137
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
138 %Quilt manages a \emph{stack of patches} on top of a directory tree.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
139 %To begin, you tell quilt to manage a directory tree, and tell it which
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
140 %files you want to manage; it stores away the names and contents of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
141 %those files. To fix a bug, you create a new patch (using a single
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
142 %command), edit the files you need to fix, then ``refresh'' the patch.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
143
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
144 quilt$B$O%G%#%l%/%H%j%D%j!<>e$G(B\emph{$B%Q%C%A$N%9%?%C%/(B}$B$r4IM}$9$k!%%Q%C%A$N(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
145 $B4IM}$r;O$a$k$K$O!$(Bquilt$B$K4IM}$9$Y$-%G%#%l%/%H%j%D%j!<$H!$4IM}BP>]$N%U%!%$(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
146 $B%k$r;XDj$9$k!%(Bquilt$B$O$3$l$i$N%U%!%$%k$NL>A0$HCf?H$rJ]B8$9$k!%%P%0$r=$@5(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
147 $B$9$k>l9g$O!$$^$:?7$7$$%Q%C%A$r!J%3%^%s%I(B1$B$D$G!K:n@.$7!$I,MW$J%U%!%$%k$K(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
148 $B=$@5$r2C$($?8e!$%Q%C%A$r(B``$B%j%U%l%C%7%e(B''$B$9$l$P$h$$!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
149
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
150 %The refresh step causes quilt to scan the directory tree; it updates
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
151 %the patch with all of the changes you have made. You can create
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
152 %another patch on top of the first, which will track the changes
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
153 %required to modify the tree from ``tree with one patch applied'' to
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
154 %``tree with two patches applied''.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
155
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
156 $B%j%U%l%C%7%e$G$O!$(Bquilt$B$O%G%#%l%/%H%j%D%j!<$r%9%-%c%s$7!$JQ99A4$F$rH?1G$5(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
157 $B$;$F%Q%C%A$r99?7$9$k!%(B``$B$"$k%Q%C%A$,E,MQ$5$l$?>uBV$N%D%j!<(B''$B$+$i(B``2$B$D$N%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
158 $B%A$,E,MQ$5$l$?%D%j!<(B''$B$X99?7$9$k$N$KI,MW$JJQ99$rDI@W$7!$JL$N%Q%C%A$r:n$k(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
159 $B$3$H$b$G$-$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
160
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
161 %You can \emph{change} which patches are applied to the tree. If you
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
162 %``pop'' a patch, the changes made by that patch will vanish from the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
163 %directory tree. Quilt remembers which patches you have popped,
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
164 %though, so you can ``push'' a popped patch again, and the directory
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
165 %tree will be restored to contain the modifications in the patch.Most
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
166 %importantly, you can run the ``refresh'' command at any time, and the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
167 %topmost applied patch will be updated. This means that you can, at
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
168 %any time, change both which patches are applied and what
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
169 %modifications those patches make.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
170
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
171 $B%f!<%6$O$I$N%Q%C%A$,%D%j!<$KE,MQ$5$l$k$+$r(B\emph{$BJQ99(B}$B$G$-$k!%$"$k%Q%C%A$r(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
172 $B%]%C%W$9$k$H!$$3$N%Q%C%A$K$h$kJQ99$O%D%j!<$+$i>CLG$9$k!%(Bquilt$B$O$I$N%Q%C%A(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
173 $B$r%]%C%W$7$?$+5-21$7$F$*$j!$0lEY%]%C%W$7$?%U%!%$%k$r:F$S%W%C%7%e$7!$%G%#(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
174 $B%l%/%H%j%D%j!<$r%Q%C%A$K$h$kJQ99$,$J$5$l$?>uBV$KLa$9$3$H$,$G$-$k!%:G$b=E(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
175 $BMW$J$3$H$O!$$$$D$G$b(B``refresh''$B%3%^%s%I$r<B9T$7$F0lHV?7$7$/E,MQ$5$l$?%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
176 $B%A$r99?7$G$-$k$3$H$G$"$k!%$3$l$O$9$J$o$A!$%Q%C%A$NE,MQ$5$l$?>uBV$H!$%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
177 $B%A$=$l<+BN$r$$$D$G$b99?7$G$-$k$H$$$&$3$H$G$"$k!%(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
178
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
179 %Quilt knows nothing about revision control tools, so it works equally
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
180 %well on top of an unpacked tarball or a Subversion working copy.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
181
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
182 quilt$B$O%j%S%8%g%s4IM}%D!<%k$K$D$$$F$OA4$/4XCN$7$J$$$?$a!$E83+$5$l$?(Btar$B%"!<(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
183 $B%+%$%V>e$G$b!$(BSubversion$B$N%o!<%-%s%0%3%T!<>e$G$bF1MM$KF0:n$9$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
184
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
185 %\subsection{From patchwork quilt to Mercurial Queues}
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
186 \subsection{patchwork quilt$B$+$i(BMercurial Queues$B$X(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
187 \label{sec:mq:quilt-mq}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
188
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
189 %In mid-2005, Chris Mason took the features of quilt and wrote an
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
190 %extension that he called Mercurial Queues, which added quilt-like
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
191 %behaviour to Mercurial.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
192
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
193 2005$BG/$NCf:"!$(BChris Mason$B$O!$(Bquilt$B$N5!G=$r<h$jF~$l$F!$(BMercurial$B$K(Bquilt$B$N(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
194 $B$h$&$JF0:n$rDI2C$9$k(BMercurial Queues$B$H$$$&%(%/%9%F%s%7%g%s$r=q$$$?!%(B
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
195
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
196 %The key difference between quilt and MQ is that quilt knows nothing
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
197 %about revision control systems, while MQ is \emph{integrated} into
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
198 %Mercurial. Each patch that you push is represented as a Mercurial
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
199 %changeset. Pop a patch, and the changeset goes away.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
200
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
201 quilt$B$H(BMQ$B$N0c$$$O!$(Bquilt$B$O%j%S%8%g%s4IM}%7%9%F%`$K$D$$$F2?$b4XCN$7$J$$$N(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
202 $B$KBP$7$F!$(BMQ$B$O(BMercurial$B$KE}9g$5$l$F$$$k$3$H$G$"$k!%%W%C%7%e$7$?8D!9$N%Q%C(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
203 $B%A$O(BMercurial$B$N%A%'%s%8%;%C%H$H$7$FI=8=$5$l$k!%%Q%C%A$r%]%C%W$9$k$H!$%A%'(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
204 $B%s%8%;%C%H$O>C$($F$J$/$J$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
205
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
206 %Because quilt does not care about revision control tools, it is still
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
207 %a tremendously useful piece of software to know about for situations
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
208 %where you cannot use Mercurial and MQ.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
209
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
210 quilt$B$O%j%S%8%g%s4IM}%D!<%k$HL54X78$KMxMQ2DG=$J$?$a!$(BMercurial$B$H(BMQ$B$,;H$((B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
211 $B$J$$>u67$G$O0MA3$H$7$FHs>o$KM-1W$J%D!<%k$G$"$k$3$H$O5-21$KN1$a$F$*$/$Y$-(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
212 $B$G$"$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
213
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
214 %\section{The huge advantage of MQ}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
215 \section{MQ$B$NBg$-$JMxE@(B}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
216
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
217 %I cannot overstate the value that MQ offers through the unification of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
218 %patches and revision control.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
219
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
220 MQ$B$,%Q%C%A$H%j%S%8%g%s%3%s%H%m!<%k$NE}9g$K$h$C$F$b$?$i$92ACM$r8XD%$9$k$o(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
221 $B$1$K$O$$$+$J$$!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
222
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
223 %A major reason that patches have persisted in the free software and
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
224 %open source world---in spite of the availability of increasingly
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
225 %capable revision control tools over the years---is the \emph{agility}
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
226 %they offer.
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
227
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
228 $B;~$rDI$&Kh$K%j%S%8%g%s%3%s%H%m!<%k%D!<%k$NMxMQ$,9-$,$C$F$$$k$K$b$+$+$o$i(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
229 $B$:!$%U%j!<%=%U%H$H%*!<%W%s%=!<%9$N@$3&$K%Q%C%A$,B8:_$9$kBg$-$JM}M3$O$=$N(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
230 \emph{$B5!IR$5(B}$B$K$"$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
231
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
232 %Traditional revision control tools make a permanent, irreversible
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
233 %record of everything that you do. While this has great value, it's
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
234 %also somewhat stifling. If you want to perform a wild-eyed
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
235 %experiment, you have to be careful in how you go about it, or you risk
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
236 %leaving unneeded---or worse, misleading or destabilising---traces of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
237 %your missteps and errors in the permanent revision record.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
238
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
239 $BEAE}E*$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O!$9T$C$?A`:n$N1J5WE*$GIT2D5UE*$J(B
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
240 $B5-O?$r;D$9!%$3$l$K$OBg$-$J2ACM$,$"$k0lJ}$G!$5g6~$K46$8$k$3$H$b$"$k!%$b$7(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
241 $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
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
242 $B$J$1$l$P!$ITMW$J!$$"$k$$$O8m2r$r>7$$$?$j!$0BDj@-$rB;$J$&%H%l!<%9$H%(%i!<(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
243 $B$r1J5WE*$J%j%S%8%g%sMzNr$K;D$9$3$H$K$J$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
244
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
245 %By contrast, MQ's marriage of distributed revision control with
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
246 %patches makes it much easier to isolate your work. Your patches live
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
247 %on top of normal revision history, and you can make them disappear or
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
248 %reappear at will. If you don't like a patch, you can drop it. If a
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
249 %patch isn't quite as you want it to be, simply fix it---as many times
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
250 %as you need to, until you have refined it into the form you desire.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
251
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
252 $BBP>NE*$K!$(BMQ$B$K$h$kJ,;6%j%S%8%g%s%3%s%H%m!<%k$H%Q%C%A$N7k9g$O!$:n6H$r3VN%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
253 $B$9$k$3$H$rMZ$+$KMF0W$K$9$k!%%Q%C%A$ODL>o$N%j%S%8%g%sMzNr$N>e$K>h$C$F$*$j!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
254 $BK>$`$h$&$K>CLG$5$;$?$j:F8=$5$;$k$3$H$,$G$-$k!%%Q%C%A$r5$$KF~$i$J$1$l$P!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
255 $B$3$l$r4~5Q$9$k$3$H$b$G$-$k!%%Q%C%A$,$"$J$?$NK>$`$h$&$J$b$N$G$J$1$l$P!$4u(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
256 $BK>DL$j$K$J$k$^$G2?EY$G$b4JC1$K=$@5$9$k$3$H$,$G$-$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
257
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
258 %As an example, the integration of patches with revision control makes
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
259 %understanding patches and debugging their effects---and their
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
260 %interplay with the code they're based on---\emph{enormously} easier.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
261 %Since every applied patch has an associated changeset, you can use
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
262 %\hgcmdargs{log}{\emph{filename}} to see which changesets and patches
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
263 %affected a file. You can use the \hgext{bisect} command to
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
264 %binary-search through all changesets and applied patches to see where
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
265 %a bug got introduced or fixed. You can use the \hgcmd{annotate}
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
266 %command to see which changeset or patch modified a particular line of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
267 %a source file. And so on.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
268
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
269 $BNc$($P!$%j%S%8%g%s%3%s%H%m!<%k$X$N%Q%C%A$NE}9g$O!$%Q%C%A$rM}2r$7!$$=$N1F(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
270 $B6A!$0M$C$FN)$D%Y!<%9%3!<%I$H$NAj8_:nMQ$r%G%P%C%0$9$k$3$H$r2DG=$K$9$k!%E,(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
271 $BMQ$5$l$?%Q%C%A$O!$4XO"$E$1$i$l$?%A%'%s%8%;%C%H$r;}$D$?$a!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
272 \hgcmdargs{log}{\emph{filename}}$B$K$h$C$F$I$N%A%'%s%8%;%C%H$H%Q%C%A$,%U%!(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
273 $B%$%k$K1F6A$rM?$($F$$$k$+D4$Y$k$3$H$,$G$-$k!%(B\hgext{bisect}$B%3%^%s%I$GA4$F(B
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
274 $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
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
275 $B%P%0$,:.F~$7$?$+!$$"$k$$$O=$@5$5$l$?$+$rD4$Y$k$3$H$,$G$-$k!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
276 \hgcmd{annotate}$B%3%^%s%I$G$I$N%A%'%s%8%;%C%H$+%Q%C%A$,%=!<%9%U%!%$%k$NFC(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
277 $BDj$N9T$rJQ99$7$?$+8+$k$3$H$,$G$-$k!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
278
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
279
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
280 %\section{Understanding patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
281 \section{$B%Q%C%A$H$O2?$+(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
282 \label{sec:mq:patch}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
283
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
284 %Because MQ doesn't hide its patch-oriented nature, it is helpful to
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
285 %understand what patches are, and a little about the tools that work
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
286 %with them.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
287
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
288 MQ$B$O%Q%C%A;X8~$G$"$k@-<A$r1#JC$7$F$$$J$$$N$G!$%Q%C%A$,2?$G$"$k$+!$%D!<%k(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
289 $B$,%Q%C%A$r$I$&07$&$+$rM}2r$9$k$N$O$?$d$9$$!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
290
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
291 %The traditional Unix \command{diff} command compares two files, and
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
292 %prints a list of differences between them. The \command{patch} command
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
293 %understands these differences as \emph{modifications} to make to a
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
294 %file. Take a look at figure~\ref{ex:mq:diff} for a simple example of
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
295 %these commands in action.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
296
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
297 Unix$B$NEAE}E*$J(B\command{diff}$B%3%^%s%I$O(B2$B$D$N%U%!%$%k$rHf3S$7!$:9J,$N%j%9(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
298 $B%H$r=PNO$9$k!%(B\command{patch}$B%3%^%s%I$O$3$N:9J,$rJQ99$H2r<a$7!$%U%!%$%k(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
299 $B$K5Z$\$9!%?^(B~\ref{ex:mq:diff}$B$K$3$l$i$N%3%^%s%I$NF0:n$r<($9!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
300
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
301 \begin{figure}[ht]
46
dd657c4d3a47 Rename mq.diff to mq.dodiff Emacs won't screw up the syntax highlighting.
Bryan O'Sullivan <bos@serpentine.com>
parents: 35
diff changeset
302 \interaction{mq.dodiff.diff}
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
303 % \caption{Simple uses of the \command{diff} and \command{patch}
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
304 % commands}
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
305 \caption{\command{diff}$B%3%^%s%I$H(B\command{patch}$B%3%^%s%I$NC1=c$J;HMQNc(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
306 \label{ex:mq:diff}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
307 \end{figure}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
308
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
309 %The type of file that \command{diff} generates (and \command{patch}
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
310 %takes as input) is called a ``patch'' or a ``diff''; there is no
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
311 %difference between a patch and a diff. (We'll use the term ``patch'',
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
312 %since it's more commonly used.)
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
313
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
314 \command{diff}$B$,@8@.$9$k!J$^$?(B\command{patch}$B$,F~NO$K<h$k!K%U%!%$%k$N<o(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
315 $BN`$O(B``patch''$B$^$?$O(B``diff''$B$H8F$P$l!$$3$l$i$N4V$K$O0c$$$O$J$$!%!J0J2<$G(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
316 $B$O!$$h$jB?$/;H$o$l$F$$$k(B``patch''$B$H$$$&8@MU$r;H$&$3$H$K$9$k!%!K(B
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
317
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
318 %A patch file can start with arbitrary text; the \command{patch}
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
319 %command ignores this text, but MQ uses it as the commit message when
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
320 %creating changesets. To find the beginning of the patch content,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
321 %\command{patch} searches for the first line that starts with the
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
322 %string ``\texttt{diff~-}''.
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
323
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
324 $B%Q%C%A%U%!%$%k$OG$0U$N%F%-%9%H$G;O$^$k!%(B\command{patch}$B%3%^%s%I$O$3$N%F(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
325 $B%-%9%H$rL5;k$9$k$,!$(BMQ$B$O%A%'%s%8%;%C%H$r:n$k:]$N%3%_%C%H%a%C%;!<%8$H$7$F(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
326 $BMxMQ$9$k!%%Q%C%AFbMF$N@hF,$r8+$D$1$k$?$a$K(B\command{patch}$B$O(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
327 ``\texttt{diff~-}''$B$G;O$^$k:G=i$N9T$r%5!<%A$9$k!%(B
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
328
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
329 %MQ works with \emph{unified} diffs (\command{patch} can accept several
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
330 %other diff formats, but MQ doesn't). A unified diff contains two
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
331 %kinds of header. The \emph{file header} describes the file being
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
332 %modified; it contains the name of the file to modify. When
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
333 %\command{patch} sees a new file header, it looks for a file with that
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
334 %name to start modifying.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
335
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
336 MQ\emph{unified} diffs$B7A<0$r;H$&!%!J(B\command{patch}$B%3%^%s%I$O$3$l0J30$K2?(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
337 $B<oN`$+$N(Bdiff$B%U%)!<%^%C%H$r<u$1IU$1$k$,!$(BMQ$B$G$OMxMQ$G$-$J$$!%!K(Bunified
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
338 diff$B$O(B2$B<oN`$N%X%C%@$r;}$D!%(B\emph{file $B%X%C%@(B}$B$OJQ99$5$l$F$$$k%U%!%$%k$r5-(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
339 $B=R$9$k!%(B\command{patch}$B%3%^%s%I$O!$?7$7$$%U%!%$%k%X%C%@$r8+$D$1$k$H!$$=$3(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
340 $B$K5-=R$5$l$F$$$k%U%!%$%kL>$r;}$D%U%!%$%k$rC5$9!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
341
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
342 %After the file header comes a series of \emph{hunks}. Each hunk starts
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
343 %with a header; this identifies the range of line numbers within the file
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
344 %that the hunk should modify. Following the header, a hunk starts and
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
345 %ends with a few (usually three) lines of text from the unmodified file;
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
346 %these are called the \emph{context} for the hunk.If
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
347 %there's only a small amount of context between successive hunks,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
348 %\command{diff} doesn't print a new hunk header; it just runs the hunks
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
349 %together, with a few lines of context between modifications.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
350
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
351 $B%U%!%$%k%X%C%@$N8e$K$O0lO"$N(B\emph{hunks}$B$,B3$/!%3F!9$N(Bhunk$B$O%X%C%@$G;O$^(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
352 $B$k!%$3$N%X%C%@$O%U%!%$%kFb$G(Bhunk$B$,2~JQ$9$Y$-9THV9f$NHO0O$r<1JL$9$k$N$K;H(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
353 $B$o$l$k!%%X%C%@$KB3$-!$(Bhunk$B$O?t9T!JDL>o(B3$B!K$N2~JQ$5$l$F$$$J$$%U%!%$%k$+$i$N(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
354 $B9T$,$"$k!%$3$l$i$O(Bhunk$B$N(B\emph{$B%3%s%F%-%9%H(B}$B$H8F$P$l$k!%$b$7O"B3$9$k(Bhunk$B$N(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
355 $B4V$K%3%s%F%-%9%H$,>/$7$7$+$J$1$l$P!$(B\command{diff}$B$O?7$?$J(Bhunk$B%X%C%@$r=P(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
356 $BNO$;$:!$3F!9$N(Bhunk$B$H4V$N%3%s%F%-%9%H$r9g$o$;$F=PNO$9$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
357
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
358 %Each line of context begins with a space character. Within the hunk,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
359 %a line that begins with ``\texttt{-}'' means ``remove this line,''
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
360 %while a line that begins with ``\texttt{+}'' means ``insert this
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
361 %line.'' For example, a line that is modified is represented by one
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
362 %deletion and one insertion.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
363
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
364 $B%3%s%F%-%9%H$N3F9T$O!$6uGrJ8;z$G;O$^$k!%(Bhunk$BFb$G$O9T$O(B``\texttt{-}''$B$G;O(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
365 $B$^$k!%$3$l$O(B``$B$3$N9T$r:o=|$;$h(B''$B$r0UL#$9$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
366 $B0lJ}!$(B``\texttt{+}''$B$G;O$^$k9T$O!$(B``$B$3$N9T$rA^F~$;$h(B''$B$r0UL#$9$k!%Nc$r5s(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
367 $B$2$k$H!$JQ99$5$l$?9T$O(B1$B$D$N:o=|$H(B1$B$D$NA^F~$GI=$5$l$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
368
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
369 %We will return to some of the more subtle aspects of patches later (in
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
370 %section~\ref{sec:mq:adv-patch}), but you should have enough information
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
371 %now to use MQ.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
372
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
373 $B%Q%C%A$N:3:Y$JE@$K$D$$$F$O8e$G!J(B~\ref{sec:mq:adv-patch}$B!K$^$??($l$k$,!$(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
374 $B$3$l$^$G$G!$(BMQ$B$r;H$&$N$K==J,$J>pJs$O=R$Y$?!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
375
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
376 %\section{Getting started with Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
377 \section{Mercurial Queues$B$r;H$C$F$_$k(B}
2
379a802c0210 Add bibliography.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1
diff changeset
378 \label{sec:mq:start}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
379
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
380 %Because MQ is implemented as an extension, you must explicitly enable
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
381 %before you can use it. (You don't need to download anything; MQ ships
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
382 %with the standard Mercurial distribution.) To enable MQ, edit your
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
383 %\tildefile{.hgrc} file, and add the lines in figure~\ref{ex:mq:config}.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
384
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
385 MQ$B$O%(%/%9%F%s%7%g%s$H$7$F<BAu$5$l$F$$$k$N$G!$;H$&A0$KL@<(E*$KM-8z$K$9$k(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
386 $BI,MW$,$"$k!%!J2?$b%@%&%s%m!<%I$9$kI,MW$O$J$$!%(BMQ$B$ODL>o$N(BMercurial$B$KF1:-$5(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
387 $B$l$F$$$k!K(BMQ$B$rM-8z$K$9$k$K$O(B\tildefile{.hgrc}$B%U%!%$%k$rJT=8$7!$(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
388 $B?^(B~\ref{ex:mq:config}$B$N$h$&$K@_Dj$rDI2C$9$k!%(B
2
379a802c0210 Add bibliography.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1
diff changeset
389
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
390 \begin{figure}[ht]
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
391 \begin{codesample4}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
392 [extensions]
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
393 hgext.mq =
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
394 \end{codesample4}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
395 \label{ex:mq:config}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
396 % \caption{Contents to add to \tildefile{.hgrc} to enable the MQ
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
397 % extension}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
398 \caption{MQ$B%(%/%9%F%s%7%g%s$rM-8z$K$9$k$?$a$K(B\tildefile{.hgrc}$B$KDI2C$9$kFbMF(B}
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
399 \end{figure}
3
906d9021f9e5 Making progress on autogenerated example output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 2
diff changeset
400
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
401 %Once the extension is enabled, it will make a number of new commands
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
402 %available. To verify that the extension is working, you can use
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
403 %\hgcmd{help} to see if the \hgxcmd{mq}{qinit} command is now available; see
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
404 %the example in figure~\ref{ex:mq:enabled}.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
405
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
406 $B%(%/%9%F%s%7%g%s$,M-8z2=$5$l$k$H0lO"$N%3%^%s%I$,MxMQ2DG=$K$J$k!%%(%/%9%F(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
407 $B%s%7%g%s$,M-8z$G$"$k$3$H$r3NG'$9$k$?$a$K$O!$(B\hgcmd{help}$B$G(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
408 \hgxcmd{mq}{qinit}$B$,$"$k$3$H$r3NG'$9$k!%?^(B~\ref{ex:mq:enabled}$B$NNc$r;2>H(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
409 $B$5$l$?$$!%(B
3
906d9021f9e5 Making progress on autogenerated example output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 2
diff changeset
410
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
411 \begin{figure}[ht]
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
412 \interaction{mq.qinit-help.help}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
413 % \caption{How to verify that MQ is enabled}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
414 \caption{MQ$B$,M-8z$G$"$k$3$H$N3NG'K!(B}
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
415 \label{ex:mq:enabled}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
416 \end{figure}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
417
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
418 %You can use MQ with \emph{any} Mercurial repository, and its commands
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
419 %only operate within that repository. To get started, simply prepare
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
420 %the repository using the \hgxcmd{mq}{qinit} command (see
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
421 %figure~\ref{ex:mq:qinit}). This command creates an empty directory
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
422 %called \sdirname{.hg/patches}, where MQ will keep its metadata. As
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
423 %with many Mercurial commands, the \hgxcmd{mq}{qinit} command prints nothing
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
424 %if it succeeds.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
425
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
426 MQ$B$O(B\emph{$B$"$i$f$k(B}Mercurial$B%j%]%8%H%j$G;H$&$3$H$,$G$-!$$=$N%3%^%s%I$O3F!9(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
427 $B$N%j%]%8%H%j$NCf$K$@$1:nMQ$9$k!%;O$a$k$?$a$K(B\hgxcmd{mq}{qinit}$B%3%^%s%I$G(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
428 $B%j%]%8%H%j$rMQ0U$9$k!%!J?^(B~\ref{ex:mq:qinit}$B$r;2>H!K(B $B$3$N%3%^%s%I$O(BMQ$B$,%a(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
429 $B%?%G!<%?$rJ]B8$9$k$?$a$N(B\sdirname{.hg/patches}$B$H$$$&L>A0$N6u$N%G%#%l%/%H(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
430 $B%j$r:n@.$9$k!%B>$N(BMercurial$B%3%^%s%I$HF1MM$K!$(B\hgxcmd{mq}{qinit}$B%3%^%s%I(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
431 $B$b@.8y$9$k$H2?$bI=<($7$J$$!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
432
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
433 \begin{figure}[ht]
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
434 \interaction{mq.tutorial.qinit}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
435 % \caption{Preparing a repository for use with MQ}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
436 \caption{MQ$B$r;H$&$?$a$K%j%]%8%H%j$r=`Hw$9$k(B}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
437 \label{ex:mq:qinit}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
438 \end{figure}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
439
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
440 \begin{figure}[ht]
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
441 \interaction{mq.tutorial.qnew}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
442 % \caption{Creating a new patch}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
443 \caption{$B?7$7$$%Q%C%A$N:n@.(B}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
444 \label{ex:mq:qnew}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
445 \end{figure}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
446
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
447 %\subsection{Creating a new patch}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
448 \subsection{$B?7$7$$%Q%C%A$N:n@.(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
449
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
450 %To begin work on a new patch, use the \hgxcmd{mq}{qnew} command. This
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
451 %command takes one argument, the name of the patch to create. MQ will
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
452 %use this as the name of an actual file in the \sdirname{.hg/patches}
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
453 %directory, as you can see in figure~\ref{ex:mq:qnew}.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
454
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
455 $B?7$7$$%Q%C%A$r07$&;~$O(B\hgxcmd{mq}{qnew}$B%3%^%s%I$r;H$&!%$3$N%3%^%s%I$O:n@.(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
456 $B$5$l$k%Q%C%A$NL>A0$H$7$F0z?t$r(B1$B$D<h$k!%?^(B~\ref{ex:mq:qnew}$B$N$h$&$K!$(BMQ$B$O(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
457 $B$3$l$r(B\sdirname{.hg/patches} $B%G%#%l%/%H%jFb$N<B:]$N%U%!%$%kL>$H$7$FMxMQ$9(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
458 $B$k!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
459
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
460 %Also newly present in the \sdirname{.hg/patches} directory are two
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
461 %other files, \sfilename{series} and \sfilename{status}. The
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
462 %\sfilename{series} file lists all of the patches that MQ knows about
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
463 %for this repository, with one patch per line.Mercurial uses the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
464 %\sfilename{status} file for internal book-keeping; it tracks all of the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
465 %patches that MQ has \emph{applied} in this repository.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
466
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
467 \sdirname{.hg/patches}$B%G%#%l%/%H%j$NCf$K$O!$(B\sfilename{series}$B$H(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
468 \sfilename{status}$B$H$$$&(B2$B$D$N%U%!%$%k$b?7$7$/:n$i$l$k!%(B
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
469 \sfilename{series}$B%U%!%$%k$O(BMQ$B$,4XCN$9$k!$$3$N%j%]%8%H%jFb$NA4$F$N%Q%C%A(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
470 $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
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
471 \sfilename{status}$B%U%!%$%k$rFbIt$N4IM}$KMQ$$$k!%$3$N%U%!%$%k$O%j%]%8%H%j(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
472 $BFb$G(BMQ$B$,E,MQ$7$?A4$F$N%Q%C%A$,5-O?$5$l$F$$$k!%(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
473
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
474 %\begin{note}
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
475 % You may sometimes want to edit the \sfilename{series} file by hand;
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
476 % for example, to change the sequence in which some patches are
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
477 % applied. However, manually editing the \sfilename{status} file is
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
478 % almost always a bad idea, as it's easy to corrupt MQ's idea of what
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
479 % is happening.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
480 %\end{note}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
481
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
482 \begin{note}
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
483 $BNc$($P!$J#?t$N%Q%C%A$,E,MQ$5$l$k<j=g$rJQ99$9$k$J$I$NL\E*$G(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
484 \sfilename{series}$B%U%!%$%k$r<j$GJT=8$7$?$/$J$k$3$H$,$"$k$+$b$7$l$J$$!%(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
485 $B$7$+$7(B\sfilename{status}$B$r<j$GJT=8$9$k$N$O$[$H$s$I$N>l9gNI$/$J$$9M$($G!$(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
486 MQ$B$N>uBVDI@W$r4JC1$K68$o$;$F$7$^$&!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
487 \end{note}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
488
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
489 %Once you have created your new patch, you can edit files in the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
490 %working directory as you usually would. All of the normal Mercurial
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
491 %commands, such as \hgcmd{diff} and \hgcmd{annotate}, work exactly as
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
492 %they did before.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
493
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
494 $B?7$7$$%Q%C%A$r:n$C$?8e!$%o!<%-%s%0%G%#%l%/%H%jFb$N%U%!%$%k$rDL>oDL$jJT=8(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
495 $B$9$k$3$H$,$G$-$k!%(B\hgcmd{diff}$B$d(B\hgcmd{annotate}$B$N$h$&$JA4$F$NDL>o$N(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
496 Mercurial$B%3%^%s%I$,A4$/F1$8$h$&$K;H$($k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
497
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
498 %\subsection{Refreshing a patch}
374
32c932f185ed - fixed mq.tex a bit.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 347
diff changeset
499 \subsection{$B%Q%C%A$N%j%U%l%C%7%e(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
500
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
501 %When you reach a point where you want to save your work, use the
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
502 %\hgxcmd{mq}{qrefresh} command (figure~\ref{ex:mq:qnew}) to update the patch
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
503 %you are working on. This command folds the changes you have made in
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
504 %the working directory into your patch, and updates its corresponding
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
505 %changeset to contain those changes.
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
506
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
507 $B:n6HFbMF$r%;!<%V$9$k%]%$%s%H$K:9$7$+$+$C$?$i!$(B\hgxcmd{mq}{qrefresh}$B%3%^(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
508 $B%s%I$r;H$C$F!J?^(B~\ref{ex:mq:qnew}$B!K:n6HCf$N%Q%C%A$r99?7$9$k!%$3$N%3%^%s(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
509 $B%I$O%o!<%-%s%0%G%#%l%/%H%j$N:9J,$r%Q%C%A$K<h$j9~$_!$%A%'%s%8%;%C%H$,JQ99(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
510 $B$r4^$`$h$&$K99?7$9$k!%(B
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
511
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
512 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
513 \interaction{mq.tutorial.qrefresh}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
514 % \caption{Refreshing a patch}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
515 \caption{$B%Q%C%A$N%j%U%l%C%7%e(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
516 \label{ex:mq:qrefresh}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
517 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
518
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
519 %You can run \hgxcmd{mq}{qrefresh} as often as you like, so it's a good way
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
520 %to ``checkpoint'' your work. Refresh your patch at an opportune
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
521 %time; try an experiment; and if the experiment doesn't work out,
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
522 %\hgcmd{revert} your modifications back to the last time you refreshed.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
523
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
524 \hgxcmd{mq}{qrefresh}$B$O$$$D$G$b9%$-$J;~$K<B9T$G$-!$:n6H$N>uBVJ]B8$r$9$k(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
525 $B$N$K$b;H$($k!%%Q%C%A$N%j%U%l%C%7%e$OET9g$N$h$$;~$K9T$($P$h$$!%<B83E*$J%3!<(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
526 $B%I$rF0$+$9>l9g!$;vA0$K%j%U%l%C%7%e$r$7$F$*$1$P!$<B83$N7k2L%3!<%I$,F0$+$J(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
527 $B$/$F$b!$(B\hgcmd{revert}$B$9$l$P!$JQ99$O85$KLa$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
528
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
529 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
530 \interaction{mq.tutorial.qrefresh2}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
531 % \caption{Refresh a patch many times to accumulate changes}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
532 \caption{$B%Q%C%A$N%j%U%l%C%7%e$GJQ99$rC_@Q$9$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
533 \label{ex:mq:qrefresh2}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
534 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
535
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
536 %\subsection{Stacking and tracking patches}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
537 \subsection{$B%Q%C%A$N%9%?%C%/$HDI@W(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
538
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
539 %Once you have finished working on a patch, or need to work on another,
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
540 %you can use the \hgxcmd{mq}{qnew} command again to create a new patch.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
541 %Mercurial will apply this patch on top of your existing patch. See
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
542 %figure~\ref{ex:mq:qnew2} for an example. Notice that the patch
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
543 %contains the changes in our prior patch as part of its context (you
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
544 %can see this more clearly in the output of \hgcmd{annotate}).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
545
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
546 $B%Q%C%A$X$N:n6H$,=*N;$7$?$j!$B>$N:n6H$r$r$9$kI,MW$,$"$k>l9g!$(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
547 \hgxcmd{mq}{qnew}$B%3%^%s%I$r<B9T$7!$?7$7$$%Q%C%A$r:n$k$3$H$,$G$-$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
548 Mercurial$B$O$3$N%Q%C%A$r4{B8$N%Q%C%A$N>e$+$iE,MQ$9$k!%?^(B~\ref{ex:mq:qnew2}$B$r(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
549 $B;2>H$N$3$H!%%Q%C%A$O@h9T$9$k%Q%C%A$NJQ99$r%3%s%F%-%9%H$H$7$F;}$D!%!J(B\hgcmd{annotate}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
550 $B$N=PNO$G$h$jL@NF$K3NG'$9$k$3$H$,$G$-$k!%!K(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
551
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
552 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
553 \interaction{mq.tutorial.qnew2}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
554 % \caption{Stacking a second patch on top of the first}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
555 \caption{$B:G=i$N%Q%C%A$N>e$K(B2$BHVL\$N%Q%C%A$r%9%?%C%/$9$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
556 \label{ex:mq:qnew2}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
557 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
558
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
559 %So far, with the exception of \hgxcmd{mq}{qnew} and
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
560 %\hgxcmd{mq}{qrefresh}, we've been careful to only use regular Mercurial
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
561 %commands. However, MQ provides many commands that are easier to use
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
562 %when you are thinking about patches, as illustrated in
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
563 %figure~\ref{ex:mq:qseries}:
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
564
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
565 $B$3$l$^$G$O(B\hgxcmd{mq}{qnew}$B$H(B\hgxcmd{mq}{qrefresh}$B$r=|$$$F!$DL>o$N(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
566 Mercurial$B%3%^%s%I$N$_$r;H$&$h$&$KCm0U$7$F$-$?!%$7$+$7(BMQ$B$O%Q%C%A$r07$&>l(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
567 $B9g!$?^(B~\ref{ex:mq:qseries}$B$K<($9$h$&$J$h$j4JC1$J%3%^%s%I$rMQ0U$7$F$$$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
568
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
569 %\begin{itemize}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
570 %\item The \hgxcmd{mq}{qseries} command lists every patch that MQ knows
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
571 % about in this repository, from oldest to newest (most recently
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
572 % \emph{created}).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
573 %\item The \hgxcmd{mq}{qapplied} command lists every patch that MQ has
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
574 % \emph{applied} in this repository, again from oldest to newest (most
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
575 % recently applied).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
576 %\end{itemize}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
577
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
578 \begin{itemize}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
579 \item \hgxcmd{mq}{qseries}$B%3%^%s%I$O(BMQ$B$,4XCN$9$k%j%]%8%H%jFb$N%Q%C%AA4$F(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
580 $B$r8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
581 \item \hgxcmd{mq}{qapplied}$B%3%^%s%I$O(BMQ$B$,(B\emph{$BE,MQ$7$?(B}$B%j%]%8%H%jFb$N(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
582 $B%Q%C%AA4$F$r$d$O$j8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
583 \end{itemize}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
584
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
585 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
586 \interaction{mq.tutorial.qseries}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
587 % \caption{Understanding the patch stack with \hgxcmd{mq}{qseries} and
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
588 % \hgxcmd{mq}{qapplied}}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
589 \caption{\hgxcmd{mq}{qseries}$B$H(B\hgxcmd{mq}{qapplied}$B$G%Q%C%A%9%?%C%/$r(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
590 $BD4$Y$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
591 \label{ex:mq:qseries}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
592 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
593
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
594
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
595 %\subsection{Manipulating the patch stack}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
596 \subsection{$B%Q%C%A%9%?%C%/$NA`:n(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
597
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
598 %The previous discussion implied that there must be a difference
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
599 %between ``known'' and ``applied'' patches, and there is. MQ can
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
600 %manage a patch without it being applied in the repository.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
601
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
602 $B$3$l$^$G$N5DO@$O(B``known''$B$H(B``applied''$B%Q%C%A$K0c$$$,$"$k$3$H$r0EL[$K2>Dj(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
603 $B$7$F$$$?!%(BMQ$B$O:90[$N$J$$%Q%C%A$r%j%]%8%H%j$KBP$7$FE,MQ$9$k$3$H$b$G$-$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
604
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
605 %An \emph{applied} patch has a corresponding changeset in the
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
606 %repository, and the effects of the patch and changeset are visible in
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
607 %the working directory. You can undo the application of a patch using
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
608 %the \hgxcmd{mq}{qpop} command. MQ still \emph{knows about}, or manages, a
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
609 %popped patch, but the patch no longer has a corresponding changeset in
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
610 %the repository, and the working directory does not contain the changes
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
611 %made by the patch. Figure~\ref{fig:mq:stack} illustrates the
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
612 %difference between applied and tracked patches.
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
613
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
614 \emph{$BE,MQ$5$l$?(B}$B%Q%C%A$O%j%]%8%H%jFb$KBP1~$9$k%A%'%s%8%;%C%H$r;}$A!$%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
615 $B%A$N8z2L$H%A%'%s%8%;%C%H$O%o!<%-%s%0%G%#%l%/%H%jFb$G8+$k$3$H$,$G$-$k!%%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
616 $B%A$NE,MQ$O(B\hgxcmd{mq}{qpop}$B%3%^%s%I$G<h$j>C$9$3$H$,$G$-$k!%%]%C%W$5$l$?%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
617 $B%A$OBP1~$9$k%A%'%s%8%;%C%H$r;}$?$:!$JQ99$b%o!<%-%s%0%G%#%l%/%H%j$K;D$C$F(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
618 $B$$$J$$$,!$(BMQ$B$O%]%C%W$5$l$?%Q%C%A$r0MA3$H$7$F5-21$7!$4IM}$7$F$$$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
619 $B?^(B~\ref{fig:mq:stack}$B$OE,MQ$5$l$?%Q%C%A$H4IM}$5$l$F$$$k%Q%C%A$N0c$$$r<((B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
620 $B$9!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
621
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
622 \begin{figure}[ht]
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
623 \centering
35
e68f4a96c16e Fixed the \grafix macro to work for PDFs again.
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 30
diff changeset
624 \grafix{mq-stack}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
625 % \caption{Applied and unapplied patches in the MQ patch stack}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
626 \caption{MQ$B%Q%C%A%9%?%C%/$NCf$NE,MQ$5$l$?%Q%C%A$HE,MQ$5$l$J$$%Q%C%A(B}
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
627 \label{fig:mq:stack}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
628 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
629
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
630 %You can reapply an unapplied, or popped, patch using the \hgxcmd{mq}{qpush}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
631 %command. This creates a new changeset to correspond to the patch, and
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
632 %the patch's changes once again become present in the working
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
633 %directory. See figure~\ref{ex:mq:qpop} for examples of \hgxcmd{mq}{qpop}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
634 %and \hgxcmd{mq}{qpush} in action. Notice that once we have popped a patch
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
635 %or two patches, the output of \hgxcmd{mq}{qseries} remains the same, while
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
636 %that of \hgxcmd{mq}{qapplied} has changed.
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
637
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
638 $BE,MQ$r30$7$?%Q%C%A$d%]%C%W$7$?%Q%C%A$r(B\hgxcmd{mq}{qpush}$B%3%^%s%I$G:FE,MQ(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
639 $B$9$k$3$H$,$G$-$k!%$3$N%3%^%s%I$O!$%Q%C%A$KBP1~$7$??7$7$$%A%'%s%8%;%C%H$r(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
640 $B:n$j!$%Q%C%A$K$h$kJQ99$O$b$&0lEY%o!<%-%s%0%G%#%l%/%H%j$K8=$l$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
641 \hgxcmd{mq}{qpop}$B$H(B\hgxcmd{mq}{qpush}$B$N;HMQNc$r?^(B~\ref{ex:mq:qpop}$B$K<($9!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
642 1$B$D$^$?$OJ#?t$N%Q%C%A$r%]%C%W$9$k$H(B\hgxcmd{mq}{qapplied}$B$N=PNO$OJQ2=$9$k(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
643 $B$,!$(B\hgxcmd{mq}{qseries}$B$N=PNO$OF1$8$^$^;D$k$N$KCm0U$5$l$?$$!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
644
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
645 \begin{figure}[ht]
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
646 \interaction{mq.tutorial.qpop}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
647 % \caption{Modifying the stack of applied patches}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
648 \caption{$BE,MQ$5$l$?%Q%C%A$N%9%?%C%/$rJQ99$9$k(B}
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
649 \label{ex:mq:qpop}
11
e9d5b4c3d16b First SVG image!
Bryan O'Sullivan <bos@serpentine.com>
parents: 8
diff changeset
650 \end{figure}
e9d5b4c3d16b First SVG image!
Bryan O'Sullivan <bos@serpentine.com>
parents: 8
diff changeset
651
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
652 %\subsection{Pushing and popping many patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
653 \subsection{$B%Q%C%A$N%W%C%7%e$H%]%C%W(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
654
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
655 %While \hgxcmd{mq}{qpush} and \hgxcmd{mq}{qpop} each operate on a single patch at
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
656 %a time by default, you can push and pop many patches in one go. The
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
657 %\hgxopt{mq}{qpush}{-a} option to \hgxcmd{mq}{qpush} causes it to push all
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
658 %unapplied patches, while the \hgxopt{mq}{qpop}{-a} option to \hgxcmd{mq}{qpop}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
659 %causes it to pop all applied patches. (For some more ways to push and
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
660 %pop many patches, see section~\ref{sec:mq:perf} below.)
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
661
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
662 \hgxcmd{mq}{qpush}$B$H(B\hgxcmd{mq}{qpop}$B$O0lEY$K3F!9$N%Q%C%A0l$D$:$D$rA`:n$9(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
663 $B$k!J$3$l$O%G%U%)%k%HF0:n$G$"$k!K0lJ}!$J#?t$N%Q%C%A$r0lEY$K%]%C%W!&%W%C%7%e(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
664 $B$9$kA`:n$b$"$k!%(B\hgxcmd{mq}{qpush}$B%3%^%s%I$N(B\hgxopt{mq}{qpush}{-a}$B%*%W%7%g(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
665 $B%s$O!$L$E,MQ$N%Q%C%AA4BN$r%W%C%7%e$7!$(B\hgxcmd{mq}{qpop}$B%3%^%s%I$N(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
666 \hgxopt{mq}{qpop}{-a} $B%*%W%7%g%s$OE,MQ:Q$_$N%Q%C%AA4BN$r%]%C%W$9$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
667 $B!JB>$NJ#?t$N%Q%C%A$rF1;~$K%W%C%7%e!&%]%C%W$9$kJ}K!$K$D$$$F$O2<(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
668 $B$N(B~\ref{sec:mq:perf}$B$r;2>H$N$3$H!K(B
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
669
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
670 \begin{figure}[ht]
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
671 \interaction{mq.tutorial.qpush-a}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
672 % \caption{Pushing all unapplied patches}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
673 \caption{$BE,MQ$5$l$F$$$J$$%Q%C%A$rA4$F%W%C%7%e$9$k(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
674 \label{ex:mq:qpush-a}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
675 \end{figure}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
676
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
677 %\subsection{Safety checks, and overriding them}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
678 \subsection{$B0BA4@-%A%'%C%/$H%*!<%P%i%$%I(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
679
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
680 %Several MQ commands check the working directory before they do
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
681 %anything, and fail if they find any modifications. They do this to
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
682 %ensure that you won't lose any changes that you have made, but not yet
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
683 %incorporated into a patch.Figure~\ref{ex:mq:add} illustrates this;
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
684 %the \hgxcmd{mq}{qnew} command will not create a new patch if there are
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
685 %outstanding changes, caused in this case by the \hgcmd{add} of
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
686 %\filename{file3}.
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
687
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
688 $B$$$/$D$+$N(BMQ$B%3%^%s%I$O!$<B9T;~$K$^$:%o!<%-%s%0%G%#%l%/%H%j$r%A%'%C%/$7!$(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
689 $BJQ99$,$J$5$l$F$$$?$i=*N;$9$k$h$&$K$J$C$F$$$k!%$3$l$O!$%f!<%6$N$^$@%Q%C%A(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
690 $B$K<h$j9~$^$l$F$$$J$$JQ99$,<:$o$l$J$$$h$&$K$9$k$?$a$G$"$k!%(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
691 $B?^(B~\ref{ex:mq:add}$B$O$3$l$r@bL@$7$?$b$N$G!$(B\hgxcmd{mq}{qnew}$B%3%^%s%I$O8IN)(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
692 $B$7$?JQ99$,$"$k;~$K?7$?$J%Q%C%A$r@8@.$7$J$$!%$3$NNc$G$O!$JQ99$O(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
693 \hgcmd{add}$B$K$h$k(B\filename{file3}$B$NDI2C$K$h$C$F@8$^$l$F$$$k!%(B
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
694
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
695 \begin{figure}[ht]
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
696 \interaction{mq.tutorial.add}
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
697 % \caption{Forcibly creating a patch}
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
698 \caption{$B%Q%C%A$N6/@)E*$J@8@.(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
699 \label{ex:mq:add}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
700 \end{figure}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
701
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
702 %Commands that check the working directory all take an ``I know what
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
703 %I'm doing'' option, which is always named \option{-f}. The exact
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
704 %meaning of \option{-f} depends on the command. For example,
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
705 %\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}} will incorporate any outstanding
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
706 %changes into the new patch it creates, but
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
707 %\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}} will revert modifications to any
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
708 %files affected by the patch that it is popping. Be sure to read the
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
709 %documentation for a command's \option{-f} option before you use it!
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
710
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
711 $B%o!<%-%s%0%G%#%l%/%H%j$N%A%'%C%/$r9T$&%3%^%s%I$OA4$F!$>e5i<T8~$1$N6/@)(B
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
712 $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
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
713 $B$h$C$F0[$J$k!%Nc$($P(B\hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}}$B$O8IN)$7$?JQ(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
714 $B99$r?7$7$$%Q%C%A$K<h$j9~$`$H$$$&0UL#$@$,!$(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
715 \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}}$B$O!$%]%C%W$9$k%Q%C%A$K$h$k$"$i$f(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
716 $B$k%U%!%$%k$X$NJQ99$r<h$j>C$9$H$$$&0UL#$K$J$k!%(B\option{-f}$B%*%W%7%g%s$r;H(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
717 $B$&;~$OI,$:;vA0$K%3%^%s%I$N%I%-%e%a%s%H$rFI$s$G3NG'$9$k$h$&$K$7$FM_$7$$!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
718
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
719 %\subsection{Working on several patches at once}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
720 \subsection{$BJ#?t$N%Q%C%A$r0lEY$K07$&(B}
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
721
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
722 %The \hgxcmd{mq}{qrefresh} command always refreshes the \emph{topmost}
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
723 %applied patch. This means that you can suspend work on one patch (by
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
724 %refreshing it), pop or push to make a different patch the top, and
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
725 %work on \emph{that} patch for a while.
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
726
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
727 \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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
728 $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
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
729 $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
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
730 $B%]%C%W$d%W%C%7%e$,$G$-$k$H$$$&$3$H$r0UL#$9$k!%(B
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
731
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
732 %Here's an example that illustrates how you can use this ability.
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
733 %Let's say you're developing a new feature as two patches. The first
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
734 %is a change to the core of your software, and the second---layered on
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
735 %top of the first---changes the user interface to use the code you just
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
736 %added to the core. If you notice a bug in the core while you're
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
737 %working on the UI patch, it's easy to fix the core. Simply
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
738 %\hgxcmd{mq}{qrefresh} the UI patch to save your in-progress changes, and
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
739 %\hgxcmd{mq}{qpop} down to the core patch. Fix the core bug,
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
740 %\hgxcmd{mq}{qrefresh} the core patch, and \hgxcmd{mq}{qpush} back to the UI
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
741 %patch to continue where you left off.
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
742
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
743 $B$3$N5!G=$N;H$$J}$r<($9Nc$r<($9!%(B2$B$D$N%Q%C%A$H$7$F?7$7$$5!G=$r3+H/$7$F$$$k(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
744 $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
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
745 $BL\$N$b$N$N>e$KE83+$9$k!$:#DI2C$7$?%3%"$N%3!<%I$r;H$C$?%f!<%6%$%s%?%U%'!<(B
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
746 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
747 $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
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
748 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
749 $B$K(B\hgxcmd{mq}{qrefresh}$B$r%3%"%Q%C%A$K$D$$$F9T$$!$(B\hgxcmd{mq}{qpush}$B$G(B
335
2a8c05da3fae more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 333
diff changeset
750 UI$B%Q%C%A$KLa$C$F:n6H$rB3$1$k!%(B
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
751
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
752 %\section{More about patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
753 \section{$B$5$i$K%Q%C%A$K$D$$$F(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
754 \label{sec:mq:adv-patch}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
755
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
756 %MQ uses the GNU \command{patch} command to apply patches, so it's
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
757 %helpful to know a few more detailed aspects of how \command{patch}
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
758 %works, and about patches themselves.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
759
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
760 MQ$B$O%Q%C%A$NE,MQ$K(BGNU$B$N(B\command{patch}$B%3%^%s%I$rMQ$$$k!%$=$N$?$a!$(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
761 \command{patch}$B$NF0:n$H%Q%C%A<+BN$K$D$$$F$h$j>\$7$/CN$C$F$*$/$3$H$OM-MQ(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
762 $B$G$"$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
763
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
764 %\subsection{The strip count}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
765 \subsection{$B%9%H%j%C%W%+%&%s%H(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
766
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
767 %If you look at the file headers in a patch, you will notice that the
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
768 %pathnames usually have an extra component on the front that isn't
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
769 %present in the actual path name. This is a holdover from the way that
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
770 %people used to generate patches (people still do this, but it's
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
771 %somewhat rare with modern revision control tools).
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
772
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
773 $B%Q%C%A$N%U%!%$%k%X%C%@$r8+$k$H!$%Q%9%M!<%`$N:G=i$KDI2C$NItJ,$,$D$$$F$$$k(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
774 $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
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
775 $B@.$9$k;~$N=,47$+$i$N0dJ*$G$"$k!%!JB?$/$N?M$,$$$^$@$3$NJ}K!$r;H$C$F$$$k$,!$(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
776 $B6aBeE*$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$G$O$[$H$s$I8+$i$l$J$$!%!K(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
777
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
778 %Alice would unpack a tarball, edit her files, then decide that she
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
779 %wanted to create a patch. So she'd rename her working directory,
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
780 %unpack the tarball again (hence the need for the rename), and use the
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
781 %\cmdopt{diff}{-r} and \cmdopt{diff}{-N} options to \command{diff} to
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
782 %recursively generate a patch between the unmodified directory and the
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
783 %modified one.
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
784 %The result would be that the name of the unmodified
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
785 %directory would be at the front of the left-hand path in every file
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
786 %header, and the name of the modified directory would be at the front
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
787 %of the right-hand path.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
788
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
789 $B%"%j%9$,(Btar$B%"!<%+%$%V$rE83+$7!$%U%!%$%k$rJT=8$7!$%Q%C%A$r:n$j$?$$$H;W$C$F(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
790 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
791 $B$7!$(B tar$B%"!<%+%$%V$r$b$&0lEYE83+$9$k!%$=$7$F%*%j%8%J%k$N$^$^$N%G%#%l%/%H(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
792 $B%j$H!$JQ99$r9T$J$C$?%G%#%l%/%H%j$N4V$G!$$=$7$F(B\command{diff}$B$K(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
793 \cmdopt{diff}{-r}$B$H(B\cmdopt{diff}{-N}$B%*%W%7%g%s$rIU$1$F!$:F5"E*$J:9J,$r<h(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
794 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
795 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
796 $B$N@hF,$KJQ99$7$?J}$N%G%#%l%/%H%jL>$,8=$l$F$$$k$O$:$G$"$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
797
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
798 %Since someone receiving a patch from the Alices of the net would be
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
799 %unlikely to have unmodified and modified directories with exactly the
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
800 %same names, the \command{patch} command has a \cmdopt{patch}{-p}
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
801 %option that indicates the number of leading path name components to
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
802 %strip when trying to apply a patch. This number is called the
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
803 %\emph{strip count}.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
804
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
805 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
806 $B%H%j$HJQ99$5$l$?%G%#%l%/%H%j$NN>J}$r%"%j%9$HF1$8L>A0$G;}$C$F$$$k2DG=@-$O(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
807 $B$^$:$J$$!%(B\command{patch}$B%3%^%s%I$K$O(B\cmdopt{patch}{-p}$B%*%W%7%g%s$,$"$j!$(B
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
808 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
809 $B$O(B\emph{$B%9%H%j%C%W%+%&%s%H(B}$B$H8F$P$l$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
810
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
811 %An option of ``\texttt{-p1}'' means ``use a strip count of one''. If
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
812 %\command{patch} sees a file name \filename{foo/bar/baz} in a file
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
813 %header, it will strip \filename{foo} and try to patch a file named
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
814 %\filename{bar/baz}. (Strictly speaking, the strip count refers to the
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
815 %number of \emph{path separators} (and the components that go with them
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
816 %) to strip. A strip count of one will turn \filename{foo/bar} into
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
817 %\filename{bar}, but \filename{/foo/bar} (notice the extra leading
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
818 %slash) into \filename{foo/bar}.)
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
819
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
820 $B%*%W%7%g%s(B``\texttt{-p1}''$B$O(B``$B%9%H%j%C%W%+%&%s%H(B1$B$r;H$&(B''$B$H$$$&0UL#$G$"(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
821 $B$k!%$b$7(B\command{patch}$B$,%U%!%$%k%X%C%@$K(B\filename{foo/bar/baz}$B$r8+$D$1(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
822 $B$?;~$O!$(B\filename{foo}$B$rMn$7$F(B\filename{bar/baz}$B$H$$$&L>A0$N%U%!%$%k$K%Q%C(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
823 $B%A$r;n$_$k!%!J87L)$K8@$&$H%9%H%j%C%W%+%&%s%H$O(B\emph{$B%Q%9%;%Q%l!<%?(B}$B$N?t(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
824 $B$r;2>H$7$F$$$k!J7k2L$H$7$FMWAG$b;2>H$5$l$k!K%9%H%j%C%W%+%&%s%H(B1$B$O(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
825 \filename{foo/bar}$B$r(B\filename{bar}$B$KJQ$($k!%$^$?(B\filename{/foo/bar}$B!JA0(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
826 $B$KCV$+$l$?%9%i%C%7%e$KCm0U!K$O(B\filename{foo/bar}$B$H$J$k!%!K(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
827
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
828 %The ``standard'' strip count for patches is one; almost all patches
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
829 %contain one leading path name component that needs to be stripped.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
830 %Mercurial's \hgcmd{diff} command generates path names in this form,
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
831 %and the \hgcmd{import} command and MQ expect patches to have a strip
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
832 %count of one.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
833
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
834 $B%Q%C%A$X$N(B``$BI8=`E*$J(B''$B%9%H%j%C%W%+%&%s%H$O(B1$B$G$"$k!%$[$H$s$IA4$F$N%Q%C%A(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
835 $B$O<h$j=|$/$Y$-%Q%9MWAG$r0l$D;}$C$F$$$k!%(BMercurial$B$N(B\hgcmd{diff}$B%3%^%s%I(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
836 $B$O%Q%9L>$r$3$N7A<0$G@8@.$7!$(B\hgcmd{import}$B%3%^%s%I$H(BMQ$B$O%9%H%j%C%W%+%&%s(B
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
837 $B%H(B1$B$rA0Ds$H$7$F$$$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
838
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
839 %If you receive a patch from someone that you want to add to your patch
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
840 %queue, and the patch needs a strip count other than one, you cannot
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
841 %just \hgxcmd{mq}{qimport} the patch, because \hgxcmd{mq}{qimport} does not yet
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
842 %have a \texttt{-p} option (see~\bug{311}). Your best bet is to
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
843 %\hgxcmd{mq}{qnew} a patch of your own, then use \cmdargs{patch}{-p\emph{N}}
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
844 %to apply their patch, followed by \hgcmd{addremove} to pick up any
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
845 %files added or removed by the patch, followed by \hgxcmd{mq}{qrefresh}.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
846 %This complexity may become unnecessary; see~\bug{311} for details.
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
847
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
848 $BC/$+$+$i%Q%C%A$r<u$1<h$j!$%Q%C%A%-%e!<$KDI2C$9$k$H$-!$%9%H%j%C%W%+%&%s%H(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
849 $B$,(B1$B0J30$G$"$l$PC1$K(B\hgxcmd{mq}{qimport}$B$9$k$3$H$O$G$-$J$$!%$3$l$O(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
850 \hgxcmd{mq}{qimport}$B%3%^%s%I$,$^$@(B\texttt{-p}$B%*%W%7%g%s$r;}$C$F$$$J$$$?$a(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
851 $B$@!J(B\bug{311}$B$r;2>H!K!%:G$b>e<j$/$$$-$=$&$JJ}K!$O!$(B\hgxcmd{mq}{qnew}$B$G?7(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
852 $B$?$K%Q%C%A$r:n$j!$(B\cmdargs{patch}{-p\emph{N}}$B$r<B9T$7$F<u$1<h$C$?%Q%C%A$r(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
853 $BE,MQ$7$?8e!$%Q%C%A$K$h$C$FDI2C$5$l$?$j:o=|$5$l$?%U%!%$%k$r(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
854 \hgcmd{addremove}$B$K$h$C$F%T%C%/%"%C%W$7!$(B\hgxcmd{mq}{qrefresh}$B$r<B9T$9$k(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
855 $B$3$H$G$"$k!%$3$NJ#;($J<j=g$O>-MhE*$K$OI,MW$J$/$J$k$O$:$@!J(B\bug{311}$B$r;2(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
856 $B>H!K!%(B
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
857
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
858 %\subsection{Strategies for applying a patch}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
859 \subsection{$B%Q%C%AE,MQ$N$?$a$N@oN,(B}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
860
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
861 %When \command{patch} applies a hunk, it tries a handful of
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
862 %successively less accurate strategies to try to make the hunk apply.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
863 %This falling-back technique often makes it possible to take a patch
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
864 %that was generated against an old version of a file, and apply it
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
865 %against a newer version of that file.
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
866
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
867 \command{patch}$B$,(Bhunk$B$rE,MQ$9$k$H$-!$$$$/$D$+$N$"$^$j@53N$G$J$$@oN,$rB3$1(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
868 $B$FMQ$$$k!%$3$N%U%)!<%k%P%C%/<jK!$K$h$C$F!$8E$$%P!<%8%g%s$N%U%!%$%k$KBP$7(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
869 $B$F:n@.$7$?%Q%C%A$r?7$7$$%U%!%$%k$KE,MQ$9$k$3$H$5$($7$P$7$P2DG=$H$J$k!%(B
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
870
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
871 %First, \command{patch} tries an exact match, where the line numbers,
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
872 %the context, and the text to be modified must apply exactly. If it
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
873 %cannot make an exact match, it tries to find an exact match for the
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
874 %context, without honouring the line numbering information. If this
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
875 %succeeds, it prints a line of output saying that the hunk was applied,
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
876 %but at some \emph{offset} from the original line number.
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
877
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
878 $B:G=i$K!$(B\command{patch}$B$O9THV9f!$%3%s%F%-%9%H!$JQ99$5$l$k%F%-%9%H$N@53N$J(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
879 $B%^%C%A$r;n$_$k!%@53N$J%^%C%A$,$G$-$J$$>l9g!$9THV9f$rL5;k$7$F%3%s%F%-%9%H(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
880 $B$N@53N$J%^%C%A$r;n$_$k!%$3$l$,@.8y$9$l$P!$(Bhunk$B$,E,MQ$5$l$?$,!$(B\emph{$B%*%U(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
881 $B%;%C%H(B}$B$,@8$8$?$H$$$&%a%C%;!<%8$rI=<($9$k!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
882
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
883 %If a context-only match fails, \command{patch} removes the first and
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
884 %last lines of the context, and tries a \emph{reduced} context-only
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
885 %match. If the hunk with reduced context succeeds, it prints a message
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
886 %saying that it applied the hunk with a \emph{fuzz factor} (the number
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
887 %after the fuzz factor indicates how many lines of context
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
888 %\command{patch} had to trim before the patch applied).
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
889
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
890 $B%3%s%F%-%9%H$N$_$N%^%C%A$,<:GT$9$k$H!$(B\command{patch}$B$O%3%s%F%-%9%H$N:G=i(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
891 $B$H:G8e$N9T$r:o$j!$%3%s%F%-%9%H$N(B\emph{$B=L>.(B}$B%^%C%A$r;n$_$k!%=L>.%3%s%F%-%9(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
892 $B%H$K$h$k(Bhunk$B$,@.8y$9$k$H!$(Bhunk$B$,E,MQ$5$l$?$3$H$H(B\emph{fuzz $B%U%!%/%?!<(B}$B$r(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
893 $B4^$`%a%C%;!<%8$rI=<($9$k!%!J(Bfuzz$B%U%!%/%?!<$N8e$m$N?t;z$O!$(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
894 \command{patch}$B%3%^%s%I$,!$%Q%C%A$rE,MQ$9$kA0$K%3%s%F%-%9%H$N2?9T$r:o=|$9(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
895 $B$kI,MW$,$"$C$?$N$+$r<($9!%!K(B
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
896
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
897 %When neither of these techniques works, \command{patch} prints a message
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
898 %saying that the hunk in question was rejected. It saves rejected hunks
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
899 %(also simply called ``rejects'') to a file with the same name, and an
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
900 %added \sfilename{.rej} extension. It also saves an unmodified copy of
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
901 %the file with a \sfilename{.orig} extension; the copy of the file
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
902 %without any extensions will contain any changes made by hunks that
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
903 %\emph{did} apply cleanly. If you have a patch that modifies
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
904 %\filename{foo} with six hunks, and one of them fails to apply, you will
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
905 %have: an unmodified \filename{foo.orig}, a \filename{foo.rej} containing
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
906 %one hunk, and \filename{foo}, containing the changes made by the five
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
907 %successful five hunks.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
908
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
909 $B$I$A$i$b>e<j$/$$$+$J$+$C$?>l9g!$(B\command{patch}$B$O(Bhunk$B$,%j%8%'%/%H$5$l$?$H(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
910 $B$$$&%a%C%;!<%8$rI=<($9$k!%%3%^%s%I$O%j%8%'%/%H$5$l$?(Bhunk$B!J$"$k$$$OC1$K(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
911 ``rejects''$B!K$rF1L>$G3HD%;R(B\sfilename{.rej}$B$N%U%!%$%k$K%;!<%V$9$k!%%3%^%s(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
912 $B%I$OF1;~$KL5JQ99$N%U%!%$%k$r(B\sfilename{.orig}$B$H$$$&3HD%;R$G%;!<%V$9$k!#3H(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
913 $BD%;R$N$J$$%U%!%$%k$N%3%T!<$O!$(Bhunk$B$+$i%/%j!<%s$KE,MQ$5$l$?JQ99$rA4$F4^$`!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
914 \filename{foo}$B$H$$$&%U%!%$%k$rJQ99$9$k(B6$B$D$N(Bhunk$B$r4^$`%Q%C%A%U%!%$%k$,$"$j!$(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
915 $B$=$NFb$N(B1$B$D$,E,MQ$G$-$J$+$C$?$H$9$k$H!$L5JQ99$N%U%!%$%k(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
916 \filename{foo.orig}$B!$(Bhunk1$B$D$r4^$`%U%!%$%k(B\filename{foo.rej}$B!$@5$7$/E,MQ(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
917 $B$5$l$?(B5$B$D$N(Bhunk$B$r4^$`%U%!%$%k(B\filename{foo}$B$,@8@.$5$l$k!%(B
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
918
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
919 %\subsection{Some quirks of patch representation}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
920 \subsection{$B%Q%C%AI=8=$N4qL/$JE@(B}
25
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
921
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
922 %There are a few useful things to know about how \command{patch} works
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
923 %with files.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
924 %\begin{itemize}
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
925 %\item This should already be obvious, but \command{patch} cannot
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
926 % handle binary files.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
927 %\item Neither does it care about the executable bit; it creates new
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
928 % files as readable, but not executable.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
929 %\item \command{patch} treats the removal of a file as a diff between
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
930 % the file to be removed and the empty file. So your idea of ``I
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
931 % deleted this file'' looks like ``every line of this file was
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
932 % deleted'' in a patch.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
933 %\item It treats the addition of a file as a diff between the empty
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
934 % file and the file to be added. So in a patch, your idea of ``I
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
935 % added this file'' looks like ``every line of this file was added''.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
936 %\item It treats a renamed file as the removal of the old name, and the
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
937 % addition of the new name. This means that renamed files have a big
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
938 % footprint in patches. (Note also that Mercurial does not currently
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
939 % try to infer when files have been renamed or copied in a patch.)
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
940 %\item \command{patch} cannot represent empty files, so you cannot use
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
941 % a patch to represent the notion ``I added this empty file to the
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
942 % tree''.
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
943 %\end{itemize}
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
944
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
945 \command{patch}$B$,%U%!%$%k$K$I$N$h$&$K:nMQ$9$k$+!$M-MQ$JE@$r$$$/$D$+=R$Y(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
946 $B$k!%(B
25
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
947 \begin{itemize}
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
948 \item $B$9$G$KL@Gr$@$,!$(B\command{patch}$B$O%P%$%J%j%U%!%$%k$r07$&$3$H$O$G$-(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
949 $B$J$$!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
950 \item $B<B9T%S%C%H$r9MN8$7$J$$$@$1$G$J$/!$?7$7$$%U%!%$%k$rFI$_<h$j2DG=B0(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
951 $B@-$G:n@.$7!$<B9T2DG=B0@-$OIU$1$J$$!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
952 \item \command{patch}$B%3%^%s%I$O%U%!%$%k$N:o=|$r:o=|$5$l$k%U%!%$%k$HCf?H(B
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
953 $B$,6u$N%U%!%$%k$H$N:9J,$H$7$F07$&!%=>$C$F!$%U%!%$%k$r:o=|$9$k$H$$(B
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
954 $B$&$3$H$O!$%Q%C%A%U%!%$%k$NCf$G$O%U%!%$%k$NCf$NA4$F$N9T$r:o=|$9$k$3(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
955 $B$H$HEy2A$G$"$k!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
956 \item \command{patch}$B%3%^%s%I$O%U%!%$%k$NDI2C$r6u$N%U%!%$%k$HDI2C$5$l$k(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
957 $B%U%!%$%k$N:9J,$H$7$F07$&!%=>$C$F%U%!%$%k$NDI2C$O%Q%C%A%U%!%$%k$NCf(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
958 $B$G$O%U%!%$%k$KA4$F$N9T$rDI2C$9$k$3$H$HEy2A$G$"$k!%(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
959 \item \command{patch}$B%3%^%s%I$OL>A0$NJQ99$5$l$?%U%!%$%k$r5lL>$N%U%!%$%k(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
960 $B$N:o=|$H?7$7$$%U%!%$%k$NDI2C$H$7$F07$&!%=>$C$FL>A0$NJQ99$5$l$?%U%!(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
961 $B%$%k$O%Q%C%AFb$GBg$-$J%U%C%H%W%j%s%H$r@j$a$k!%!J(BMercurial$B$O8=:_$N(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
962 $B$H$3$m!$%Q%C%AFb$G%U%!%$%k$,%j%M!<%`$5$l$?$N$+!$%3%T!<$5$l$?$N$+(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
963 $B$r4XCN$7$J$$!K(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
964 \item \command{patch}$B%3%^%s%I$OCf?H$N6u$N%U%!%$%k$rI=8=$G$-$J$$!%=>$C$F(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
965 $B%Q%C%A%U%!%$%k$r!V6u$N%U%!%$%k$r%D%j!<$KDI2C$9$k!W$H$$$&MQES$K;H(B
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
966 $B$&$3$H$O$G$-$J$$!%(B
25
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
967 \end{itemize}
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
968
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
969 %\subsection{Beware the fuzz}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
970 \subsection{$B[#Kf$JE@$K$D$$$F(B}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
971
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
972 %While applying a hunk at an offset, or with a fuzz factor, will often
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
973 %be completely successful, these inexact techniques naturally leave
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
974 %open the possibility of corrupting the patched file. The most common
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
975 %cases typically involve applying a patch twice, or at an incorrect
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
976 %location in the file. If \command{patch} or \hgxcmd{mq}{qpush} ever
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
977 %mentions an offset or fuzz factor, you should make sure that the
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
978 %modified files are correct afterwards.
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
979
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
980 $B$"$k%*%U%;%C%H$d(Bfuzz factor$B$N0LCV$X$N(Bhunk$B$NE,MQ$O!$B?$/$N>l9gLdBj$J$/@.8y(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
981 $B$9$k$,!$IT@53N$J%^%C%A$rMQ$$$?>l9g!$%Q%C%A$rE,MQ$7$?%U%!%$%k$r2u$7$F$$$k(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
982 $B2DG=@-$,;D$k!%:G$b$h$/$"$k$N$O!$%Q%C%A$rFsEYE,MQ$7$?$j!$%U%!%$%k$N4V0c$C(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
983 $B$?>l=j$KE,MQ$7$F$7$^$&$3$H$@!%(B\command{patch}$B$^$?$O(B\hgxcmd{mq}{qpush}$B$,%*(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
984 $B%U%;%C%H$+(Bfuzz$B%U%!%/%?!<$rI=<($7$F$$$k9g!$JQ99$5$l$?%U%!%$%k$,@5>o$G$"$k(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
985 $B$+3NG'$9$kI,MW$,$"$k!%(B
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
986
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
987 %It's often a good idea to refresh a patch that has applied with an
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
988 %offset or fuzz factor; refreshing the patch generates new context
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
989 %information that will make it apply cleanly. I say ``often,'' not
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
990 %``always,'' because sometimes refreshing a patch will make it fail to
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
991 %apply against a different revision of the underlying files. In some
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
992 %cases, such as when you're maintaining a patch that must sit on top of
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
993 %multiple versions of a source tree, it's acceptable to have a patch
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
994 %apply with some fuzz, provided you've verified the results of the
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
995 %patching process in such cases.
338
cb130184dd23 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 337
diff changeset
996
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
997 $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
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
998 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
999 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1000 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1001 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1002 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1003 $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
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
1004
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1005 %\subsection{Handling rejection}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1006 \subsection{$B%j%8%'%/%H$N<h$j07$$(B}
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1007
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1008 %If \hgxcmd{mq}{qpush} fails to apply a patch, it will print an error
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1009 %message and exit. If it has left \sfilename{.rej} files behind, it is
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1010 %usually best to fix up the rejected hunks before you push more patches
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1011 %or do any further work.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1012
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1013 \hgxcmd{mq}{qpush}$B$O%Q%C%A$NE,MQ$K<:GT$7$?>l9g!$%(%i!<%a%C%;!<%8$rI=<($7(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1014 $B$F=*N;$9$k!%(B\sfilename{.rej}$B%U%!%$%k$,:n$i$l$F$$$k>l9g$O!$DL>o!$$5$i$J$k(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1015 $B%Q%C%A$NDI2C$d?7$7$$:n6H$NA0$K%j%8%'%/%H$5$l$?(Bhunk$B$K$D$$$F=$@5$r9T$&$Y$-(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1016 $B$G$"$k!%(B
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1017
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1018 %If your patch \emph{used to} apply cleanly, and no longer does because
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1019 %you've changed the underlying code that your patches are based on,
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1020 %Mercurial Queues can help; see section~\ref{sec:mq:merge} for details.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1021
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1022 $B$=$l$^$G%Q%C%A$,%/%j!<%s$KE,MQ$5$l$F$*$j!$%Q%C%A$NBP>]$K$J$C$F$$$k%3!<%I(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1023 $B$KJQ99$r2C$($?$?$a$KE,MQ$G$-$J$/$J$C$?$N$J$i!$(BMercurial Queues$B$N;Y1g$r<u(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1024 $B$1$k$3$H$,$G$-$k!%>\$7$$>pJs$O%;%/%7%g%s(B~\ref{sec:mq:merge}$B$r8+$FM_$7$$!%(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1025
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1026 %Unfortunately, there aren't any great techniques for dealing with
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1027 %rejected hunks. Most often, you'll need to view the \sfilename{.rej}
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1028 %file and edit the target file, applying the rejected hunks by hand.
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1029
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1030 $B;DG0$J$3$H$K!$%j%8%'%/%H$5$l$?(Bhunk$B$r<h$j07$&7h$^$C$?NI$$J}K!$OB8:_$7$J(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1031 $B$$!%BgDq$N>l9g!$(B\sfilename{.rej}$B%U%!%$%k$r8+$F%?!<%2%C%H%U%!%$%k$rJT=8(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1032 $B$7!$%j%8%'%/%H$5$l$?(Bhunk$B$r<j$GE,MQ$9$k$3$H$K$J$k!%(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1033
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1034 %A Linux kernel hacker, Chris Mason (the author of Mercurial Queues),
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1035 %wrote a tool called \command{mpatch}~\cite{web:mpatch}, which takes a
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1036 %simple approach to automating the application of hunks rejected by
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1037 %\command{patch}. The \command{mpatch} command can help with four common
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1038 %reasons that a hunk may be rejected:
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1039
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1040 Linux kerner$B%O%C%+!<(B Chris Mason$B!J(BMercurial Queues$B$N:n<T$G$b$"$k!%!K(B
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1041 $B$O(B\command{mpatch}~\cite{web:mpatch}$B$H$$$&%D!<%k$r=q$$$?!%$3$N%3%^%s%I$O(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1042 \command{patch}$B%3%^%s%I$G%j%8%'%/%H$5$l$?(Bhunk$B$NE,MQ$r<+F02=$9(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1043 $B$k!%(B\command{mpatch}$B%3%^%s%I$O!$(Bhunk$B$,%j%8%'%/%H$5$l$k<g$J860x(B4$B$D$KBP1~(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1044 $B$9$k(B:
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1045
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1046 \begin{itemize}
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1047 %\item The context in the middle of a hunk has changed.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1048 \item hunk$B$NCf$N%3%s%F%-%9%H$,JQ99$5$l$?(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1049 %\item A hunk is missing some context at the beginning or end.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1050 \item hunk$B$N3+;OIt!&=*C<It$G%3%s%F%-%9%H$,8+$D$1$i$l$J$$(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1051 %\item A large hunk might apply better---either entirely or in
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1052 % part---if it was broken up into smaller hunks.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1053 \item $BBg$-$J(Bhunk$B$O$b$C$H>e<j$KE,MQ$G$-$kH&$@(B---hunk$B$r>.$5$J(Bhunk$B$KJ,3d$7(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1054 $B$FE,MQ$9$k(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1055 %\item A hunk removes lines with slightly different content than those
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1056 % currently present in the file.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1057 \item hunk$BFb$N9T$,8=:_%U%!%$%k$K$"$k9T$H<c430c$C$F$$$k>l9g!$$=$N9T$r:o=|(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1058 $B$9$k(B
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1059 \end{itemize}
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1060
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1061 %If you use \command{mpatch}, you should be doubly careful to
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1062 %check your results when you're done. In fact, \command{mpatch}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1063 %enforces this method of double-checking the tool's
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1064 %output, by automatically dropping you into a merge program when it has
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1065 %done its job, so that you can verify its work and finish off any
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1066 %remaining merges.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1067
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1068 \command{mpatch}$B$r;HMQ$7$?>l9g$O!$7k2L$K:Y?4$NCm0U$,I,MW$G$"$k!%<B:]$K$O(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1069 \command{mpatch}$B$O%D!<%k$N=PNO$GFs=E%A%'%C%/$r6/@)$7!$F0:n$,=*$k$H<+F0E*(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1070 $B$K%^!<%8%W%m%0%i%`$r5/F0$9$k!%$3$l$K$h$C$F:n6H$r3NG'$7!$I,MW$J%^!<%8$r40(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1071 $BN;$9$k$3$H$,$G$-$k!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1072
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1073
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1074 %\section{More on patch management}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1075 \section{$B$5$i$J$k%Q%C%A4IM}(B}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1076
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1077 %As you grow familiar with MQ, you will find yourself wanting
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1078 %to perform other kinds of patch management operations.
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1079
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1080 MQ$B$K47$l$k$K=>$C$F!$JL$NJ}K!$G$b%Q%C%A4IM}$r$7$?$/$J$k$@$m$&!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1081
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1082 %\subsection{Deleting unwanted patches}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1083 \subsection{$BITMW$J%Q%C%A$r>C5n$9$k(B}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1084
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1085 %If you want to get rid of a patch, use the \command{qdelete} command to
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1086 %delete the patch file and remove its entry from the patch series. If
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1087 %you try to delete a patch that is still applied, \command{qdelete} will
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1088 %refuse.
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1089
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1090 $B%Q%C%A$r>C5n$9$k$K$O!$(B\command{qdelete}$B%3%^%s%I$rMQ$$$F!$%Q%C%A%U%!%$%k$N(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1091 $B>C5n$H%Q%C%A%(%s%H%j$N%Q%C%A%7%j!<%:$+$i$NKu>C$r9T$&!%(B\command{qdelete}$B$O(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1092 $BE,MQCf$N%Q%C%A$O>C5n$7$J$$!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1093
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1094 % &interaction.ch11-qdelete.go;
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1095 \interaction{ch11-qdelete.go}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1096
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1097 %\subsection{Converting to and from permanent revisions}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1098 \subsection{$B1JB3E*$J%j%S%8%g%s$H$NAj8_JQ49(B}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1099
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1100 %Once you're done working on a patch and want to turn it into a permanent
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1101 %changeset, use the \hgxopt{mq}{qdelete}{-r} command. Pass a revision to
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1102 %the \option{-r} option to identify the patch that you want to turn into
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1103 %a regular changeset; this patch must already be applied.
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1104
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1105 $B%Q%C%A$G$N:n6H$,=*$j!$$3$l$r1JB3E*$J%A%'%s%8%;%C%H$XJQ49$7$?$$>l9g$O!$(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1106 \hgxopt{mq}{qdelete}{-r}$B%3%^%s%I$rMQ$$$k!%(B\option{-r}$B%*%W%7%g%s$K%j%S%8%g(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1107 $B%s$rEO$7!$$I$N%Q%C%A$rDL>o$N%A%'%s%8%;%C%H$KJQ49$7$?$$$N$+;XDj$9$k!%JQ49(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1108 $BBP>]$N%Q%C%A$O$9$G$KE,MQ$5$l$F$$$J$1$l$P$J$i$J$$!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1109
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1110 %&interaction.ch11-qdelete.convert;
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1111 \interaction{ch11-qdelete.convert}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1112
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1113 %It is also possible to turn an existing changeset into a patch, by
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1114 %passing the \option{-r} option to \command{qimport}.
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1115
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1116 \command{qimport}$B%3%^%s%I$K(B\option{-r}$B%*%W%7%g%s$rEO$7$F!$$9$G$KB8:_$9$k(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1117 $B%A%'%s%8%;%C%H$r%Q%C%A$KJQ49$9$k$3$H$b$G$-$k!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1118
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1119 %&interaction.ch11-qdelete.import;
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1120 \interaction{ch11-qdelete.import}
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1121
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1122 %Note that it only makes sense to convert a changeset into a patch if you
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1123 %have not propagated that changeset into any other repositories. The
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1124 %imported changeset's ID will change every time you refresh the patch,
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1125 %which will make Mercurial treat it as unrelated to the original
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1126 %changeset if you have pushed it somewhere else.
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1127
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1128 $B%A%'%s%8%;%C%H$+$i%Q%C%A$X$NJQ49$,0UL#$r;}$D$N$O!$%A%'%s%8%;%C%H$r$^$@B>(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1129 $B$N%j%]%8%H%j$KGH5Z$5$;$F$$$J$$>l9g$K8B$i$l$k!%(BMercurial$B$O%Q%C%A$KJQ49$7$?(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1130 $B%A%'%s%8%;%C%H$r85$N%A%'%s%8%;%C%H$H$OL54X78$J$b$N$H$7$F07$&$?$a!$%Q%C%A(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1131 $B$r%j%U%l%C%7%e$9$kEY$K%A%'%s%8%;%C%H(BID$B$OJQ$o$k!%$9$G$KJL$N%j%]%8%H%j$K%A%'(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1132 $B%s%8%;%C%H$r%W%C%7%e$7$F$$$k$J$i$P!$$3$l$i$N(BID$B$OAj0c$7$F$7$^$&!%(B
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1133
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1134
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1135 %\section{Getting the best performance out of MQ}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1136 \section{MQ$B$r:GBg8B$K3hMQ$9$k(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
1137 \label{sec:mq:perf}
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1138
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1139 %MQ is very efficient at handling a large number of patches. I ran
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1140 %some performance experiments in mid-2006 for a talk that I gave at the
838
d1f676a6a4b3 update mq chapter.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 835
diff changeset
1141 %2006 EuroPython conference. I used as my data
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1142 %set the Linux 2.6.17-mm1 patch series, which consists of 1,738
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1143 %patches. I applied these on top of a Linux kernel repository
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1144 %containing all 27,472 revisions between Linux 2.6.12-rc2 and Linux
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1145 %2.6.17.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1146
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1147 MQ$B$O$H$F$b8zN(E*$KBgNL$N%Q%C%A$r=hM}$9$k$3$H$,$G$-$k!%I.<T$O(B2006$BG/$NCf:"!$(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1148 2006 EuroPython conference~\cite{web:europython}$B$G$N9V1i$N$?$a$K@-G=B,Dj(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1149 $B$r9T$C$?!%B,Dj$KMQ$$$?%G!<%?$O(BLinux 2.6.17-mm1$B$N%Q%C%A%7%j!<%:$G!$(B1,738
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1150 $B$N%Q%C%A$r4^$`!%$3$N%Q%C%A$r(BLinux kernel$B%j%]%8%H%j$KE,MQ$7$?!%%j%]%8%H%j(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1151 $B$O(BLinux 2.6.12-rc2$B$+$i(BLinux 2.6.17$B$^$G$N(B27,472$B$N%j%S%8%g%s$r4^$s$G$$$k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1152
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1153 %On my old, slow laptop, I was able to
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1154 %\hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}} all 1,738 patches in 3.5 minutes,
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1155 %and \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}} them all in 30 seconds. (On a
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1156 %newer laptop, the time to push all patches dropped to two minutes.) I
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1157 %could \hgxcmd{mq}{qrefresh} one of the biggest patches (which made 22,779
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1158 %lines of changes to 287 files) in 6.6 seconds.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1159
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1160 $BI.<T$N8E$/CY$$%i%C%W%H%C%W$G!$(B\hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}}$B$G(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1161 1738$B$N%Q%C%A$9$Y$F$r=hM}$9$k$N$K(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1162 3.5$BJ,!$(B\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}}$B$r9T$&$N$K(B30$BIC$rMW$7$?!%(B($B?7(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1163 $B$7$$%i%C%W%H%C%W$G$O%W%C%7%e$N=jMW;~4V$O(B2$BJ,$G$"$C$?!%(B)$B:GBg$N%Q%C%A(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1164 (22.778$B9T$G!$(B287$B$N%U%!%$%k$rJQ99$9$k(B)$B$K(B\hgxcmd{mq}{qrefresh}$B$r9T$C$?$H$3(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1165 $B$m!$(B6.6$BIC$rMW$7$?!%(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1166
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1167 %Clearly, MQ is well suited to working in large trees, but there are a
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1168 %few tricks you can use to get the best performance of it.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1169
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1170 MQ$B$,5pBg$J%D%j!<$G$N:n6H$KE,$7$F$$$k$N$OL@$i$+$@$,!$$5$i$K:G9b$N@-G=$r0z(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1171 $B$-=P$9$?$a$K$$$/$D$+$N%H%j%C%/$,;H$($k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1172
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1173 %First of all, try to ``batch'' operations together. Every time you
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1174 %run \hgxcmd{mq}{qpush} or \hgxcmd{mq}{qpop}, these commands scan the working
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1175 %directory once to make sure you haven't made some changes and then
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1176 %forgotten to run \hgxcmd{mq}{qrefresh}. On a small tree, the time that
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1177 %this scan takes is unnoticeable. However, on a medium-sized tree
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1178 %(containing tens of thousands of files), it can take a second or more.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1179
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1180 $B$^$:Bh0l$K!$(B``batch''$B%*%Z%l!<%7%g%s$rJ;MQ$9$k$3$H$,$G$-(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1181 $B$k!%(B\hgxcmd{mq}{qpush}$B$^$?$O(B\hgxcmd{mq}{qpop}$B$O!$%o!<%-%s%0%G%#%l%/%H%j$K(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1182 $BJQ99$r2C$($?$N$K(B\hgxcmd{mq}{qrefresh}$B$N<B9T$rK:$l$F$$$J$$$+$I$&$+D4$Y$k$?(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1183 $B$a!$<B9T;~$K>o$K%o!<%-%s%0%G%#%l%/%H%j$r%9%-%c%s$9$k!%>.5,LO$J%D%j!<$G$O(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1184 $B5$$E$+$J$$DxEY$N;~4V$7$+$+$+$i$J$$$,!$(B($B?tK|$N%U%!%$%k$r;}$D$h$&$J(B)$BCf5,LO(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1185 $B$N$G$O?tIC$N;~4V$rMW$9$k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1186
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1187 %The \hgxcmd{mq}{qpush} and \hgxcmd{mq}{qpop} commands allow you to push and pop
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1188 %multiple patches at a time. You can identify the ``destination
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1189 %patch'' that you want to end up at. When you \hgxcmd{mq}{qpush} with a
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1190 %destination specified, it will push patches until that patch is at the
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1191 %top of the applied stack. When you \hgxcmd{mq}{qpop} to a destination, MQ
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1192 %will pop patches until the destination patch is at the top.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1193
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1194 \hgxcmd{mq}{qpush}$B%3%^%s%I$H(B\hgxcmd{mq}{qpop}$B%3%^%s%I$OJ#?t$N%U%!%$%k$rF1(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1195 $B;~$K(Bpush$B$^$?$O(Bpop$B$9$k$3$H$,$G$-$k!%:G=*L\E*$N%Q%C%A$,$"$k$J$i(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1196 $B$P!$(B\hgxcmd{mq}{qpush}$B$KL\E*$N%Q%C%A$r;XDj$7$F<B9T$9$k$3$H$G!$;XDj$7$?%Q%C(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1197 $B%A$,:F>e0L$K$J$k$^$G%Q%C%A$r(Bpush$B$9$k!%F1MM$K(B\hgxcmd{mq}{qpop}$B$KL\E*$N%Q%C(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1198 $B%A$r;XDj$9$l$P!$;XDj$7$?%Q%C%A$,:F>e0L$K$J$k$^$G%Q%C%A$r(Bpop$B$9$k!%(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1199
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1200 %You can identify a destination patch using either the name of the
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1201 %patch, or by number. If you use numeric addressing, patches are
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1202 %counted from zero; this means that the first patch is zero, the second
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1203 %is one, and so on.
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1204
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1205 $BL\E*$N%Q%C%A$OL>A0$G$bHV9f$G$b;XDj2DG=$G$"$k!%HV9f$,MQ$$$i$l$k>l9g$O!$%Q%C(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1206 $B%A$O(B0$B$+$i%+%&%s%H$5$l$k!%$D$^$j:G=i$N%Q%C%A$O(B0$B$H$J$j!$(B2$BHVL\$O(B1$B!$$H$$$&Iw(B
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1207 $B$K$J$k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1208
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1209 %\section{Updating your patches when the underlying code changes}
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1210 \section{$BBP>]%3!<%I$NJQ2=$K9g$o$;$F%Q%C%A$r99?7$9$k(B}
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1211 \label{sec:mq:merge}
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
1212
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1213 %It's common to have a stack of patches on top of an underlying
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1214 %repository that you don't modify directly. If you're working on
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1215 %changes to third-party code, or on a feature that is taking longer to
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1216 %develop than the rate of change of the code beneath, you will often
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1217 %need to sync up with the underlying code, and fix up any hunks in your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1218 %patches that no longer apply. This is called \emph{rebasing} your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1219 %patch series.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1220
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1221 $BD>@\JQ99$7$J$$%j%]%8%H%j$N>e$K%Q%C%A$N%9%?%C%/$r4IM}$9$k$3$H$O$h$/9T$o$l(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1222 $B$k!%%5!<%I%Q!<%F%#$N%3!<%I$rJQ99$9$k:n6H$r$7$F$$$k>l9g$d!$85$K$J$k%3!<%I(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1223 $B$NJQ99IQEY$KHf$Y$FD9$$;~4V$,$+$+$k5!G=$r3+H/$7$F$$$k>l9g!$$7$P$7$P85$N%3!<(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1224 $B%I$NF14|$r9T$$!$%Q%C%A$NCf$N$b$O$dE,MQ$G$-$J$/$J$C$?(Bhunk$B$r=$@5$9$k$3$H$K(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1225 $B$J$k$@$m$&!%$3$l$O%Q%C%A$N(B\emph{rebasing}$B$H8F$P$l$k!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1226
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1227 %The simplest way to do this is to \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}}
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1228 %your patches, then \hgcmd{pull} changes into the underlying
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1229 %repository, and finally \hgcmdargs{qpush}{\hgxopt{mq}{qpop}{-a}} your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1230 %patches again. MQ will stop pushing any time it runs across a patch
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1231 %that fails to apply during conflicts, allowing you to fix your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1232 %conflicts, \hgxcmd{mq}{qrefresh} the affected patch, and continue pushing
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1233 %until you have fixed your entire stack.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1234
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1235 $B$3$l$r9T$&:G$b4JC1$JJ}K!$O!$%Q%C%A$KBP$7$F(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1236 \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}}$B$r9T$$!$2<0L$N%j%]%8%H%j$K(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1237 \hgcmd{pull}$B$r9T$&!%$=$7$F:G8e$K%Q%C%A$K:F$S(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1238 \hgcmdargs{qpush}{\hgxopt{mq}{qpop}{-a}}$B$r9T$&!%(B MQ$B$O%Q%C%AE,MQCf$K%3%s%U(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1239 $B%j%/%H$,$"$k$H!$$$$D$G$b%W%C%7%e$rDd;_$7!$(B\hgxcmd{mq}{qrefresh}$B$K$h$C$F%3(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1240 $B%s%U%j%/%H$r=$@5$9$k5!2q$rM?$($k!%$=$N8e$K$9$Y$F$N%Q%C%A%9%?%C%/$rE,MQ$9(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1241 $B$k$^$G%W%C%7%e$rB3$1$k!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1242
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1243 %This approach is easy to use and works well if you don't expect
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1244 %changes to the underlying code to affect how well your patches apply.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1245 %If your patch stack touches code that is modified frequently or
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1246 %invasively in the underlying repository, however, fixing up rejected
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1247 %hunks by hand quickly becomes tiresome.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1248
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1249 $B$3$N%"%W%m!<%A$O4JC1$G!$%Q%C%A$NE,MQ$5$l$k2<0L$N%3!<%I$X$NJQ99$,$J$1$l$P(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1250 $B$&$^$/F/$/!%$7$+$7!$%Q%C%A%9%?%C%/$,!$IQHK$K99?7$5$l$?$j!$2<0L%j%]%8%H%j(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1251 $B$X?/F~E*$K99?7$5$l$?$j$9$k%3!<%I$K?($l$F$$$k>l9g$O%j%8%'%/%H$5$l$?%3!<%I(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1252 $B$N=$@5$OLLE]$J$b$N$K$J$k!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1253
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1254 %It's possible to partially automate the rebasing process. If your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1255 %patches apply cleanly against some revision of the underlying repo, MQ
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1256 %can use this information to help you to resolve conflicts between your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1257 %patches and a different revision.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1258
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1259 rebase$B%W%m%;%9$rItJ,E*$K<+F02=$9$k$3$H$O2DG=$G$"$k!%%Q%C%A$,2<0L$N%j%]%8(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1260 $B%H%j$N$$$:$l$+$N%P!<%8%g%s$K%/%j!<%s$KE,MQ$G$-$k$N$G$"$l$P!$(BMQ$B$O$3$N>pJs(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1261 $B$r;H$C$F%Q%C%A$H$=$NB>$N%j%S%8%g%s$H$N4V$N%3%s%U%j%/%H$r2r>C$9$k$N$r1g=u(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1262 $B$9$k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1263
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1264 %The process is a little involved.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1265 $B$3$N%W%m%;%9$O$d$d9~$_F~$C$F$$$k!%(B
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1266 \begin{enumerate}
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1267 %\item To begin, \hgcmdargs{qpush}{-a} all of your patches on top of
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1268 % the revision where you know that they apply cleanly.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1269 \item $B:G=i$K!$%Q%C%A$,%/%j!<%s$KE,MQ$G$-$k%j%S%8%g%s$N>e$G!$$9$Y$F$N%Q%C(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1270 $B%A$KBP$7$F(B\hgcmdargs{qpush}{-a}$B$r9T$&!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1271
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1272 %\item Save a backup copy of your patch directory using
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1273 % \hgcmdargs{qsave}{\hgxopt{mq}{qsave}{-e} \hgxopt{mq}{qsave}{-c}}.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1274 % This prints
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1275 % the name of the directory that it has saved the patches in. It will
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1276 % save the patches to a directory called
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1277 % \sdirname{.hg/patches.\emph{N}}, where \texttt{\emph{N}} is a small
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1278 % integer. It also commits a ``save changeset'' on top of your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1279
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1280 % applied patches; this is for internal book-keeping, and records the
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1281 % states of the \sfilename{series} and \sfilename{status} files.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1282
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1283 \item $B%Q%C%A%G%#%l%/%H%j$r%;!<%V$r(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1284 \hgcmdargs{qsave}{\hgxopt{mq}{qsave}{-e} \hgxopt{mq}{qsave}{-c}}$B$r(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1285 $BMQ$$$F9T$&!%%Q%C%A$r%;!<%V$7$?%G%#%l%/%H%jL>$,I=<($5$l$k!%$3$N%3%^(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1286 $B%s%I$O!$(B\sdirname{.hg/patches.\emph{N}}$B$H$$$&%G%#%l%/%H%j$K%;!<%V$r(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1287 $B9T$&!%$3$3$G(B\texttt{\emph{N}}$B$O>.$5$$@0?t$G$"$k!%$3$N%3%^%s%I$O(B``$B%;!<(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1288 $B%V%A%'%s%8%;%C%H(B''$B$rE,MQ$5$l$?%Q%C%A$N>e$K%3%_%C%H$9$k!%$3$l$OFbIt(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1289 $BE*$J4IM}$H!$(B\sfilename{series}$B%U%!%$%k5Z$S(B\sfilename{status}$B%U%!%$(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1290 $B%k$N>uBV$r5-O?$9$k$?$a$G$"$k!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1291
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1292 %\item Use \hgcmd{pull} to bring new changes into the underlying
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1293 % repository. (Don't run \hgcmdargs{pull}{-u}; see below for why.)
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1294
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1295 \item \hgcmd{pull}$B%3%^%s%I$r;H$C$F?7$?$JJQ99$r2<0L$N%j%]%8%H%j$K<h$j9~(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1296 $B$`!%(B(\hgcmdargs{pull}{-u}$B$r<B9T$7$F$O$$$1$J$$!%M}M3$K$D$$$F$O2<5-(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1297 $B$r;2>H!%(B)
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1298
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1299 %\item Update to the new tip revision, using
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1300 % \hgcmdargs{update}{\hgopt{update}{-C}} to override the patches you
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1301 % have pushed.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1302
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1303 \item \hgcmdargs{update}{\hgopt{update}{-C}}$B$rMQ$$$F!$(Bpush$B$7$?%Q%C%A$r%*!<(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1304 $B%P%i%$%I$7$F?7$?$J(Btip$B%j%S%8%g%s$X$N%"%C%W%G!<%H$r9T$&!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1305
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1306 %\item Merge all patches using \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m}
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1307 % \hgxopt{mq}{qpush}{-a}}. The \hgxopt{mq}{qpush}{-m} option to \hgxcmd{mq}{qpush}
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1308 % tells MQ to perform a three-way merge if the patch fails to apply.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1309
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1310 \item \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m} \hgxopt{mq}{qpush}{-a}}$B$r(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1311 $BMQ$$$F$9$Y$F$N%Q%C%A$N%^!<%8$r9T$&!%(B\hgxopt{mq}{qpush}{-m}$B%*%W%7%g(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1312 $B%s$r(B\hgxcmd{mq}{qpush}$B$KIU$1$k$H!$(BMQ$B$O%Q%C%A$NE,MQ$K<:GT$7$?>l(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1313 $B9g!$(B3$B%&%'%$%^!<%8$r9T$&!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1314
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1315 \end{enumerate}
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1316
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1317 %During the \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m}}, each patch in the
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1318 %\sfilename{series} file is applied normally. If a patch applies with
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1319 %fuzz or rejects, MQ looks at the queue you \hgxcmd{mq}{qsave}d, and
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1320 %performs a three-way merge with the corresponding changeset. This
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1321 %merge uses Mercurial's normal merge machinery, so it may pop up a GUI
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1322 %merge tool to help you to resolve problems.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1323
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1324 \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m}}$B%3%^%s%I$N<B9T(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1325 $BCf!$(B\sfilename{series}$BFb$N%Q%C%A$ODL>oDL$jE,MQ$5$l$k!%$b$7%Q%C%A$,(Bfuzz$B$d(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1326 reject$B$r=P$7$?>l9g!$(BMQ$B$O(B\hgxcmd{mq}{qsave}$B$7$?%-%e!<$r;2>H$7!$BP1~$9$k%A%'(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1327 $B%s%8%;%C%H$H$N4V$G(B3$B%&%'%$%^!<%8$r9T$&!%%^!<%8$O(BMercurial$B$NDL>o$N5!9=$r;H$C(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1328 $B$F9T$o$l$k$?$a!$@_Dj$K$h$C$FLdBj$r2r7h$9$k$?$a$N(BGUI$B%^!<%8%D!<%k$J$I$,5/F0(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1329 $B$9$k!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1330
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1331 %When you finish resolving the effects of a patch, MQ refreshes your
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1332 %patch based on the result of the merge.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1333
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1334 $B%Q%C%A$N1F6A$N2r7h$r=*$($?;~!$(BMQ$B$O%^!<%8$N7k2L$rF'$^$($F%Q%C%A$N%j%U%l%C(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1335 $B%7%e$r9T$&!%(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1336
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1337 %At the end of this process, your repository will have one extra head
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1338 %from the old patch queue, and a copy of the old patch queue will be in
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1339 %\sdirname{.hg/patches.\emph{N}}. You can remove the extra head using
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1340
344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1341 %\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a} \hgxopt{mq}{qpop}{-n} patches.\emph{N}}
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1342 %or \hgcmd{strip}. You can delete \sdirname{.hg/patches.\emph{N}} once
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1343 %you are sure that you no longer need it as a backup.
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1344
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1345 $B$3$N%W%m%;%9$N:G8e$K%j%]%8%H%j$K$O8E$$%Q%C%A%-%e!<$KM3Mh$9$k0l$DM>J,$J(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1346 head$B$,$G$-!$8E$$%Q%C%A%-%e!<$,(B\sdirname{.hg/patches.\emph{N}}$B$K%3%T!<$5$l(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1347 $B$k!%$3$N(Bhead$B$O(B\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1348 \hgxopt{mq}{qpop}{-n} patches.\emph{N}}$B$^$?$O(B\hgcmd{strip}$B$K$h$C$F>C5n$G(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1349 $B$-$k!%%P%C%/%"%C%W$,ITMW$J$3$H$,J,$+$l$P!$(B\sdirname{.hg/patches.\emph{N}}$B$r(B
cea705a64649 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 343
diff changeset
1350 $B>C5n$7$F$b9=$o$J$$!%(B
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
1351
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1352 %\section{Identifying patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1353 \section{$B%Q%C%A$N<1JL(B}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1354
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1355 %MQ commands that work with patches let you refer to a patch either by
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1356 %using its name or by a number. By name is obvious enough; pass the
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1357 %name \filename{foo.patch} to \hgxcmd{mq}{qpush}, for example, and it will
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1358 %push patches until \filename{foo.patch} is applied.
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1359
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1360 $B%Q%C%A$r07$&(BMQ$B%3%^%s%I$O!$%Q%C%A$r%Q%C%AL>$^$?$OHV9f$G;2>H$9$k!%L>A0$N>l(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1361 $B9g$ONc$($P%U%!%$%kL>(B\filename{foo.patch}$B$r(B\hgxcmd{mq}{qpush}$B$KEO$9!%$3$N(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1362 $B>l9g!$%3%^%s%I$O(B\filename{foo.patch}$B$^$G$N%U%!%$%k$r%W%C%7%e$9$k!%(B
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1363
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1364 %As a shortcut, you can refer to a patch using both a name and a
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1365 %numeric offset; \texttt{foo.patch-2} means ``two patches before
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1366 %\texttt{foo.patch}'', while \texttt{bar.patch+4} means ``four patches
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1367 %after \texttt{bar.patch}''.
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1368
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1369 $B%7%g!<%H%+%C%H$H$7$F!$%Q%C%A$KL>A0$H?t;z$K$h$k%*%U%;%C%HN>J}$rMQ$$$F;2>H(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1370 $B$9$k$3$H$,$G$-$k!%(B\texttt{foo.patch-2}$B$O(B``\texttt{foo.patch}$B$N(B2$B$DA0$N%Q%C(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1371 $B%A(B''$B$H2r<a$5$l$k!%$^$?!$(B\texttt{bar.patch+4}$B$O(B``\texttt{bar.patch}$B$N(B4$B$D(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1372 $B8e$N%Q%C%A(B''$B$H2r<a$5$l$k!%(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1373
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1374 %Referring to a patch by index isn't much different. The first patch
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1375 %printed in the output of \hgxcmd{mq}{qseries} is patch zero (yes, it's one
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1376 %of those start-at-zero counting systems); the second is patch one; and
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1377 %so on
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1378
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1379 $B%$%s%G%C%/%9$,$"$^$j0c$o$J$$%Q%C%A$N;2>H!%(B\hgxcmd{mq}{qseries}$B$G:G=i$KI=(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1380 $B<($5$l$k%Q%C%A$O%Q%C%A(B0($B$3$l$b(B0$B$+$i?t$(;O$a$k(B)$B$G!$(B2$BHVL\$O%Q%C%A(B1$B$N$h$&$K(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1381 $BB3$/!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1382
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1383 %MQ also makes it easy to work with patches when you are using normal
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1384 %Mercurial commands. Every command that accepts a changeset ID will
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1385 %also accept the name of an applied patch. MQ augments the tags
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1386 %normally in the repository with an eponymous one for each applied
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1387 %patch. In addition, the special tags \index{tags!special tag
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1388 % names!\texttt{qbase}}\texttt{qbase} and \index{tags!special tag
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1389 % names!\texttt{qtip}}\texttt{qtip} identify the ``bottom-most'' and
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1390 %topmost applied patches, respectively.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1391
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1392 MQ$B$O!$DL>o$N(BMercurial$B%3%^%s%I$r;H$&;~$N$b4JC1$K$7$F$$$k!%A4$F$N%3%^%s%I$O(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1393 $B%A%'%s%8%;%C%H(BID$B$HE,MQ$5$l$?%Q%C%A$NHV9f$r<u$1IU$1$k!%(BMQ$B$O!$%j%]%8%H%j$K(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1394 $BE,MQ$5$l$?%Q%C%A$NL>A0$N$D$$$?%?%0$r<u$1IU$1$k!%$5$i$K!$:G2<0L$NE,MQ$5$l(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1395 $B$?%Q%C%A$rI=$9FCJL$J%?%0(B\index{tags!special tag
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1396 names!\texttt{qbase}}\texttt{qbase}$B$H!$:G>e0L$rI=$9FCJL$J%?%0(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1397 \index{tags!special tag names!\texttt{qtip}}\texttt{qtip}$B$b<u$1IU$1$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1398
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1399 %These additions to Mercurial's normal tagging capabilities make
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1400 %dealing with patches even more of a breeze.
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1401
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1402 Mercurial$B$NDL>o$N%?%05!G=$X$N$3$l$i$NDI2C$O!$%Q%C%A$N<h$j07$$$K$*$$$FBg$-(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1403 $B$J0UL#$r;}$D!%(B
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1404
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1405 \begin{itemize}
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1406 %\item Want to patchbomb a mailing list with your latest series of
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1407 % changes?
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1408 \item $B0lO"$N:G?7$NJQ99$r%Q%C%AGzCF$H$7$F%a!<%j%s%0%j%9%H$X$KEj$29~$_$?$$(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1409 $B$@$m$&$+!)(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1410 \begin{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1411 hg email qbase:qtip
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1412 \end{codesample4}
345
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1413 % (Don't know what ``patchbombing'' is? See
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1414 % section~\ref{sec:hgext:patchbomb}.)
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1415 (``patchbombing''$B$,2?$+J,$+$i$J$1$l$P(Bsection~\ref{sec:hgext:patchbomb}$B$r(B
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1416 $B;2>H$N$3$H!%(B)
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1417 %\item Need to see all of the patches since \texttt{foo.patch} that
6da6c5741e90 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 344
diff changeset
1418 % have touched files in a subdirectory of your tree?
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1419 \item $B%D%j!<Cf$N%5%V%G%#%l%/%H%j$K4^$^$l$k%U%!%$%k$K?($l$?(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1420 \texttt{foo.patch}$B0J9_$N%Q%C%A$rA4$F8+$?$$$+!)(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1421 \begin{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1422 hg log -r foo.patch:qtip \emph{subdir}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1423 \end{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1424 \end{itemize}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1425
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1426 %Because MQ makes the names of patches available to the rest of
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1427 %Mercurial through its normal internal tag machinery, you don't need to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1428 %type in the entire name of a patch when you want to identify it by
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1429 %name.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1430
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1431 MQ$B$G$N%Q%C%A$NL>>N$O!$FbIt$N%?%05!9=$rMQ$$$F$$$k$?$a!$(BMercurial$B$NB>$NItJ,(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1432 $B$G$bMxMQ2DG=$G$"$k!%L>>N$r;XDj$9$k;~!$L>>NA4$F$rF~NO$9$kI,MW$O$J$$!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1433
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1434 \begin{figure}[ht]
155
914babdc99c8 run-example: better error if bogus section name found.
Bryan O'Sullivan <bos@serpentine.com>
parents: 106
diff changeset
1435 \interaction{mq.id.output}
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1436 % \caption{Using MQ's tag features to work with patches}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1437 \caption{$B%Q%C%A$r07$&$?$a(BMQ$B$N%?%05!G=$rMxMQ$9$k(B}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1438 \label{ex:mq:id}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1439 \end{figure}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1440
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1441 %Another nice consequence of representing patch names as tags is that
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1442 %when you run the \hgcmd{log} command, it will display a patch's name
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1443 %as a tag, simply as part of its normal output. This makes it easy to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1444 %visually distinguish applied patches from underlying ``normal''
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1445 %revisions. Figure~\ref{ex:mq:id} shows a few normal Mercurial
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1446 %commands in use with applied patches.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1447
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1448 $B%Q%C%AL>$r%?%0$H$7$F<h$j07$&$3$H$N$b$&0l$D$NMxE@$O!$(B\hgcmd{log}$B%3%^%s%I(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1449 $B$r<B9T$7$?;~!$DL>o=PNO$N0lIt$K%Q%C%AL>$r%?%0$H$7$FI=<($9$kE@$G$"$k!%$3$N(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1450 $B$?$a!$E,MQ$7$?%Q%C%A$O2<0L$N(B``$BDL>o$N(B''$B%j%S%8%g%s$H;k3PE*$K6hJL$70W$/$J$k!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1451 $B?^(B~\ref{ex:mq:id}$B$K$$$/$D$+$NDL>o$N(BMercurial$B%3%^%s%I$rE,MQ:Q$_%Q%C%A$H6&(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1452 $B$K;HMQ$7$?>l9g$r<($9!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1453
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1454 %\section{Useful things to know about}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1455 \section{$BCN$C$F$*$/$Y$-$$$/$D$+$NE@(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1456
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1457 %There are a number of aspects of MQ usage that don't fit tidily into
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1458 %sections of their own, but that are good to know. Here they are, in
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1459 %one place.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1460
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1461 MQ$B$N;HMQK!$K$O8DJL$K<h$j>e$2$k$[$I$G$O$J$$$,!$CN$C$F$*$/$HNI$$$$$/$D$+$N(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1462 $BE@$,$"$k!%$3$3$G$O$=$l$i$r$^$H$a$F<h$j>e$2$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1463
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1464 \begin{itemize}
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1465 %\item Normally, when you \hgxcmd{mq}{qpop} a patch and \hgxcmd{mq}{qpush} it
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1466 % again, the changeset that represents the patch after the pop/push
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1467 % will have a \emph{different identity} than the changeset that
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1468 % represented the hash beforehand. See
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1469 % section~\ref{sec:mqref:cmd:qpush} for information as to why this is.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1470 \item $B%Q%C%A$r(B\hgxcmd{mq}{qpop}$B$7$?8e$G:F$S(B\hgxcmd{mq}{qpush}$B$9$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1471 $B$H!$(Bpop/push$B$7$?8e$N%A%'%s%8%;%C%H$O!$0JA0$N%A%'%s%8%;%C%H$H0[$J$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1472 $B%"%$%G%s%F%#%F%#$r;}$A!$%O%C%7%eCM$,0[$J$k!%$3$NM}M3$K$D$$$F$O%;%/(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1473 $B%7%g%s(B~\ref{sec:mqref:cmd:qpush}$B$r;2>H$5$l$?$$!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1474 %\item It's not a good idea to \hgcmd{merge} changes from another
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1475 % branch with a patch changeset, at least if you want to maintain the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1476 % ``patchiness'' of that changeset and changesets below it on the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1477 % patch stack. If you try to do this, it will appear to succeed, but
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1478 % MQ will become confused.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1479 \item \hgcmd{merge}$B$,B>$N%V%i%s%A$N%Q%C%A%A%'%s%8%;%C%H$r%^!<%8$9$k$3$H(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1480 $B$O!$$=$N%A%'%s%8%;%C%H$H%Q%C%A%9%?%C%/$K@Q$_9~$^$l$?B>$N%A%'%s%8%;%C(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1481 $B%H$H$N4V$G0l4S@-$r0];}$7$h$&$H$9$k$N$G$"$l$PHr$1$k$Y$-$G$"$k!%$3$l(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1482 $B$r;n$_$?>l9g!$0l8+@.8y$7$?$h$&$K8+$($F$b(BMQ$B$O:.Mp>uBV$K4Y$C$F$7$^(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1483 $B$&!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1484 \end{itemize}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1485
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1486 %\section{Managing patches in a repository}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1487 \section{$B%j%]%8%H%jFb$G$N%Q%C%A$N4IM}(B}
106
9cbc5d0db542 Finish off advanced MQ chapter (maybe).
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
1488 \label{sec:mq:repo}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1489
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1490 %Because MQ's \sdirname{.hg/patches} directory resides outside a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1491 %Mercurial repository's working directory, the ``underlying'' Mercurial
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1492 %repository knows nothing about the management or presence of patches.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1493
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1494 MQ$B$N(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$O(BMercurial$B%j%]%8%H%j$N%o!<%-%s%0(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1495 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1496 $B$d!$$=$NB8:_<+BN$K$D$$$F2?$bCN$i$J$$!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1497
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1498 %This presents the interesting possibility of managing the contents of
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1499 %the patch directory as a Mercurial repository in its own right. This
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1500 %can be a useful way to work. For example, you can work on a patch for
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1501 %a while, \hgxcmd{mq}{qrefresh} it, then \hgcmd{commit} the current state of
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1502 %the patch. This lets you ``roll back'' to that version of the patch
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1503 %later on.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1504
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1505 $B$3$N$3$H$+$i!$%Q%C%A%G%#%l%/%H%j$N4IM}$rFHN)$7$?(BMercurial$B%j%]%8%H%j$H$7$F(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1506 $B9T$&$3$H$,$G$-$k$N$G$O$J$$$+$H$$$&6=L#$,@8$^$l$k!%<B:]$3$NJ}K!$OM-8z$JJ}(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1507 $BK!$H$J$jF@$k!%Nc$($P!$$7$P$i$/$N4V(B1$B$D$N%Q%C%A$K$D$$$F:n6H$r9T$C$?8e(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1508 $B$G!$(B\hgxcmd{mq}{qrefresh}$B$r9T$$!$%Q%C%A$N8=:_$N>uBV$r(B\hgcmd{commit}$B$9$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1509 $B$3$H$,$G$-$k!%$3$l$K$h$C$F!$8e$G$3$N%Q%C%A$r(B``$B%m!<%k%P%C%/(B''$B$9$k$3$H$,2D(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1510 $BG=$H$J$k!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1511
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1512 %You can then share different versions of the same patch stack among
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1513 %multiple underlying repositories. I use this when I am developing a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1514 %Linux kernel feature. I have a pristine copy of my kernel sources for
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1515 %each of several CPU architectures, and a cloned repository under each
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1516 %that contains the patches I am working on. When I want to test a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1517 %change on a different architecture, I push my current patches to the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1518 %patch repository associated with that kernel tree, pop and push all of
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1519 %my patches, and build and test that kernel.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1520
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1521 $BJ#?t$N2<0L%j%]%8%H%j$N4V$G!$F1$8%Q%C%A%9%?%C%/$N0[$J$k%P!<%8%g%s$r6&M-$9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1522 $B$k$3$H$,$G$-$k!%I.<T$O$3$l$r(BLinux$B%+!<%M%k$N5!G=$r3+H/$9$k;~$KMxMQ$7$F$$(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1523 $B$k!%$$$/$D$+$N(BCPU$B%"!<%-%F%/%A%c$N3F!9$KBP$7$F$^$C$5$i$J%+!<%M%k%=!<%9$N%j(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1524 $B%]%8%H%j$rMQ0U$7!$:n6HCf$N%Q%C%A$r4^$`%j%]%8%H%j$r$=$l$i$N4V$G%/%m!<%s$7(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1525 $B$F$$$k!%JQ99$r0[$J$k%"!<%-%F%/%A%c$G%F%9%H$7$?$$;~$O!$8=:_$N%Q%C%A$r$=$N(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1526 $B%"!<%-%F%/%A%cMQ$N%+!<%M%k%D%j!<$H7k$SIU$$$?%Q%C%A$N%j%]%8%H%j$X%W%C%7%e(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1527 $B$7!$$9$Y$F$N%Q%C%A$r(Bpop$B!$(Bpush$B$7$F%+!<%M%k$N%S%k%I$H%F%9%H$r9T$C$F$$$k!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1528
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1529 %Managing patches in a repository makes it possible for multiple
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1530 %developers to work on the same patch series without colliding with
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1531 %each other, all on top of an underlying source base that they may or
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1532 %may not control.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1533
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1534 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1535 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1536 $B%9$r%3%s%H%m!<%k$G$-$k$+H]$+$K4X$o$j$,$J$$!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1537
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1538 %\subsection{MQ support for patch repositories}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1539 \subsection{MQ$B$K$h$k%Q%C%A%j%]%8%H%j%5%]!<%H(B}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1540
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1541 %MQ helps you to work with the \sdirname{.hg/patches} directory as a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1542 %repository; when you prepare a repository for working with patches
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1543 %using \hgxcmd{mq}{qinit}, you can pass the \hgxopt{mq}{qinit}{-c} option to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1544 %create the \sdirname{.hg/patches} directory as a Mercurial repository.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1545
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1546 MQ$B$O(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$r%j%]%8%H%j$H$7$F;H$$$J$,$i:n6H$9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1547 $B$k$3$H$r%5%]!<%H$7$F$$$k!%%Q%C%A$r07$&:n6HMQ$N%j%]%8%H%j$r(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1548 \hgxcmd{mq}{qinit}$B$G:n@.$9$k;~!$(B\hgxopt{mq}{qinit}{-c}$B$rEO$7$F(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1549 \sdirname{.hg/patches}$B%G%#%l%/%H%j$r(BMercurial$B%j%]%8%H%j$K$9$k$3$H$,$G$-$k!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1550
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1551 \begin{note}
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1552 % If you forget to use the \hgxopt{mq}{qinit}{-c} option, you can simply go
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1553 % into the \sdirname{.hg/patches} directory at any time and run
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1554 % \hgcmd{init}. Don't forget to add an entry for the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1555 % \sfilename{status} file to the \sfilename{.hgignore} file, though
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1556 % (\hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} does this for you
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1557 % automatically); you \emph{really} don't want to manage the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1558 % \sfilename{status} file.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents: 66
diff changeset
1559
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1560 \hgxopt{mq}{qinit}{-c}$B%*%W%7%g%s$rK:$l$?>l9g$O$$$D$G$b(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1561 \sdirname{.hg/patches}$B$KF~$C$F(B\hgcmd{init}$B$r<B9T$9$l$P$h(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1562 $B$$!%(B\sfilename{status}$B%U%!%$%k$r(B\sfilename{.hgignore}$B%U%!%$%k$KDI2C$9$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1563 $B$N$rK:$l$J$$$3$H!%(B(\hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}}$B$O$3$l$r<+F0(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1564 $BE*$K9T$&!%!K(B\sfilename{status}$B$r%P!<%8%g%s4IM}$9$kI,MW$O(B\emph{$BA4$/$J$$(B}$B!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1565 \end{note}
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1566
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1567 %As a convenience, if MQ notices that the \dirname{.hg/patches}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1568 %directory is a repository, it will automatically \hgcmd{add} every
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1569 %patch that you create and import.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1570
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1571 \dirname{.hg/patches}$B$,%j%]%8%H%j$N;~$O!$(BMQ$B$OJXMx$N$?$a$K$3$l$^$G:n@.$7!$(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1572 $B%$%s%]!<%H$7$?$9$Y$F$N%Q%C%A$r<+F0E*$K(B\hgcmd{add}$B$9$k!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1573
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1574 %MQ provides a shortcut command, \hgxcmd{mq}{qcommit}, that runs
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1575 %\hgcmd{commit} in the \sdirname{.hg/patches} directory. This saves
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1576 %some bothersome typing.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1577
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1578 MQ$B$O%7%g!<%H%+%C%H%3%^%s%I(B\hgxcmd{mq}{qcommit}$B$r;}$D!%$3$N%3%^%s%I$O(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1579 \hgcmd{commit}$B%3%^%s%I$r(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$NCf$G<B9T$9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1580 $B$k!%$3$l$K$h$C$FHK;($JF~NO$r>J$/$3$H$,$G$-$k!%(B
283
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1581
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1582 %Finally, as a convenience to manage the patch directory, you can
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1583 %define the alias \command{mq} on Unix systems. For example, on Linux
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1584 %systems using the \command{bash} shell, you can include the following
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1585 %snippet in your \tildefile{.bashrc}.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1586
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1587 $B%Q%C%A%G%#%l%/%H%j$N4IM}$N$?$a$K(BUNIX$B4D6-$J$i(B\command{mq}$B$H$$$&%(%$%j%"%9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1588 $B$r:n$C$F$*$/$HJXMx$@!%(BLinux$B$G$O(B\command{bash}$B%7%'%k$N@_Dj%U%!%$%k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1589 \tildefile{.bashrc}$B$K$3$l$rDj5A$7$F$*$/!%(B
283
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1590
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1591 \begin{codesample2}
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1592 alias mq=`hg -R \$(hg root)/.hg/patches'
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1593 \end{codesample2}
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1594
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1595 %You can then issue commands of the form \cmdargs{mq}{pull} from
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1596 %the main repository.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1597
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1598 $B%a%$%s%j%]%8%H%j$+$i(B\cmdargs{mq}{pull}$B$r<B9T$9$k$3$H$,$G$-$k(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1599
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1600 %\subsection{A few things to watch out for}
343
f3f56da2e650 more mq.tex
Yoshiki Yazawa <yaz@honeyplnaet.jp>
parents: 338
diff changeset
1601 \subsection{$BCm0U$7$F$*$/$Y$-$$$/$D$+$NE@(B}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1602
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1603 %MQ's support for working with a repository full of patches is limited
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1604 %in a few small respects.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1605
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1606 MQ$B$,BgNL$N%Q%C%A$N$"$k%j%]%8%H%j$r07$&:]$K!$$$$/$D$+$N>.$5$JE@$+$i@)8B$,(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1607 $B$"$k!%(B
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1608
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1609 %MQ cannot automatically detect changes that you make to the patch
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1610 %directory. If you \hgcmd{pull}, manually edit, or \hgcmd{update}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1611 %changes to patches or the \sfilename{series} file, you will have to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1612 %\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}} and then
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1613 %\hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}} in the underlying repository to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1614 %see those changes show up there. If you forget to do this, you can
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1615 %confuse MQ's idea of which patches are applied.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1616
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1617 MQ$B$O!$%Q%C%A%G%#%l%/%H%j$KBP$7$F9T$o$l$?JQ99$r<+F0E*$K8!=P$9$k$3$H$O$G$-(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1618 $B$J$$!%%Q%C%A%U%!%$%k$d(B\sfilename{series}$B$KBP$7$F(B\hgcmd{pull}$B$r9T$C$?$j!$(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1619 $B<j$GJT=8$7$?$j!$(B\hgcmd{update}$B$r9T$C$?>l9g(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1620 $B$O!$2<0L$N%j%]%8%H%j$KBP$7$F(B\hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}}$B$H(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1621 \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}}$B$r9T$$!$JQ99$rCN$i$;$kI,MW$,$"(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1622 $B$k!%$3$l$rK:$l$k$H(BMQ$B$O$I$N%Q%C%A$,E,MQ$5$l$?$N$+GD0.$G$-$J$/$J$C$F$7$^$&!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1623
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1624
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1625 %\section{Third party tools for working with patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1626 \section{$B%Q%C%A8~$1%5!<%I%Q!<%F%#%D!<%k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1627 \label{sec:mq:tools}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1628
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1629 %Once you've been working with patches for a while, you'll find
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1630 %yourself hungry for tools that will help you to understand and
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1631 %manipulate the patches you're dealing with.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1632
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1633 $B$7$P$i$/%Q%C%A$r;H$C$?:n6H$r$7$F$$$k$H!$%Q%C%A$r<h$j07$&=u$1$H$J$k$h$&$J(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1634 $B%D!<%k$,M_$7$/$J$k$K0c$$$J$$!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1635
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1636 %The \command{diffstat} command~\cite{web:diffstat} generates a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1637 %histogram of the modifications made to each file in a patch. It
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1638 %provides a good way to ``get a sense of'' a patch---which files it
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1639 %affects, and how much change it introduces to each file and as a
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1640 %whole. (I find that it's a good idea to use \command{diffstat}'s
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1641 %\cmdopt{diffstat}{-p} option as a matter of course, as otherwise it
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1642 %will try to do clever things with prefixes of file names that
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1643 %inevitably confuse at least me.)
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1644
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1645 \command{diffstat}$B%3%^%s%I(B~\cite{web:diffstat}$B$O%Q%C%AFb$N$=$l$>$l$N%U%!(B
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1646 $B%$%k$X$NJQ99$N%R%9%H%0%i%`$r@8@.$9$k!%$3$l$O!$%Q%C%A$,1F6A$r5Z$\$9%U%!%$(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1647 $B%k$rGD0.$7$?$j!$A4BN$G$=$l$>$l$N%U%!%$%k$X$I$NDxEYJQ99$r2C$($k$N$+GD0.$9(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1648 $B$k$N$KLrN)$D!%(B $B!J(B\command{diffstat}$B%3%^%s%I$N(B\cmdopt{diffstat}{-p}$B%*%W%7%g(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1649 $B%s$rMQ$$$k$N$OL^O@NI$$9M$($G$"$k!%$5$b$J$1$l$P%3%^%s%I$O%U%!%$%kL>$N(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1650 prefix$B$KBP$7$F(B``$B8-$$(B''$B$3$H$r$7$G$+$9$?$a!$>/$J$/$H$bI.<T$O:.Mp$rHr$1$i$l(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1651 $B$J$+$C$?!%!K(B
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1652
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1653
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1654 \begin{figure}[ht]
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1655 \interaction{mq.tools.tools}
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1656 % \caption{The \command{diffstat}, \command{filterdiff}, and
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1657 % \command{lsdiff} commands}
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1658 \caption{\command{diffstat}, \command{filterdiff}, $B$*$h$S(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1659 \command{lsdiff} $B%3%^%s%I(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1660 \label{ex:mq:tools}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1661 \end{figure}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1662
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1663 %The \package{patchutils} package~\cite{web:patchutils} is invaluable.
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1664 %It provides a set of small utilities that follow the ``Unix
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1665 %philosophy;'' each does one useful thing with a patch. The
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1666 %\package{patchutils} command I use most is \command{filterdiff}, which
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1667 %extracts subsets from a patch file. For example, given a patch that
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1668
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1669 %modifies hundreds of files across dozens of directories, a single
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1670 %invocation of \command{filterdiff} can generate a smaller patch that
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1671 %only touches files whose names match a particular glob pattern. See
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1672 %section~\ref{mq-collab:tips:interdiff} for another example.
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1673
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1674 \package{patchutils}$B%Q%C%1!<%8(B~\cite{web:patchutils}$B$OHs>o$KM-MQ$G$"$k!%(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1675 $B$3$N%Q%C%1!<%8$O(B``UNIX$BE/3X(B''$B$K=>$C$?>.$5$J%f!<%F%#%j%F%#$+$i$J$j!$3F!9$N(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1676 $B%f!<%F%#%j%F%#$O%Q%C%A$KBP$7$FM-MQ$JC15!G=$rDs6!$9(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1677 $B$k!%(B\package{patchutils}$B$NCf$GI.<T$,:G$bNI$/;H$&%3%^%s%I$O(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1678 \command{filterdiff}$B$G!$$3$l$O%Q%C%A%U%!%$%k$+$i%Q%C%A$NItJ,=89g$r<h$j=P(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1679 $B$9!%Nc$($P!$(B10$B0J>e$N%G%#%l%/%H%j$K8Y$C$F?tI4$N%U%!%$%k$KJQ99$r9T$&$h$&$J(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1680 $B%Q%C%A$,$"$k$H$7$F!$$?$@0l2s$N(B\command{filterdiff}$B$N<B9T$GFCDj$N%Q%?!<%s(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1681 $B$K%^%C%A$7$?%U%!%$%k$N$_$rJQ99$9$k$h$j>.$5$J%Q%C%A$r@8@.$9$k$3$H$,$G$-(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1682 $B$k!%$=$N$[$+$NNc$O(B\ref{mq-collab:tips:interdiff}$B$r8+$h!%(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1683
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1684
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1685 %\section{Good ways to work with patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1686 \section{$B9%$^$7$$%Q%C%A<h$j07$$J}K!(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1687
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1688 %Whether you are working on a patch series to submit to a free software
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1689 %or open source project, or a series that you intend to treat as a
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1690 %sequence of regular changesets when you're done, you can use some
802
de4142983445 Propagate 3b640272a966
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 374
diff changeset
1691 %simple techniques to keep your work well organized.
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1692
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1693 $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
835
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1694 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1695 $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
8a3041e6f3cb reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 802
diff changeset
1696 $B$^$/9T$J$&$?$a$N%7%s%W%k$J%F%/%K%C%/$,$"$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1697
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1698 %Give your patches descriptive names. A good name for a patch might be
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1699 %\filename{rework-device-alloc.patch}, because it will immediately give
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1700 %you a hint what the purpose of the patch is. Long names shouldn't be a
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1701 %problem; you won't be typing the names often, but you \emph{will} be
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1702 %running commands like \hgxcmd{mq}{qapplied} and \hgxcmd{mq}{qtop} over
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1703 %and over. Good naming becomes especially important when you have a
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1704 %number of patches to work with, or if you are juggling a number of
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1705 %different tasks and your patches only get a fraction of your attention.
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1706
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1707 $B%Q%C%A$K5-=RE*$JL>A0$rM?$($k!%%Q%C%A$KM?$($k$Y$-NI$$L>A0$O(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1708 \filename{rework-device-alloc.patch}$B$N$h$&$J$b$N$G$"$k!%M}M3$OB(:B$K%Q%C(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1709 $B%A$NL\E*$N%R%s%H$rM?$($k$+$i$G$"$k!%D9$$L>A0$OLdBj$K$O$J$i$J$$!%$J$<$J$i(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1710 $BL>A0$r%?%$%W$9$k$3$H$OLGB?$K$J$/!$Be$o$j$K(B\hgxcmd{mq}{qapplied}$B$d(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1711 \hgxcmd{mq}{qtop}$B$N$h$&$J%3%^%s%I$r7+$jJV$7<B9T$9$k$3$H$K$J$k$+$i$G$"$k!%(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1712 $BB??t$N%Q%C%A$KBP$7$F:n6H$r$7$F$$$k$H$-$O!$NI$$L>A0$rIU$1$k$3$H$OFC$K=EMW(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1713 $B$H$J$k!%$=$&$7$J$$$H!$$b$7$"$J$?$,$?$/$5$s$NJL$N%?%9%/$rJz$($F$$$k$J$i(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1714 $B$P!$%Q%C%A$N6hJL$O$D$+$J$/$J$C$F$7$^$&!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1715
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1716 %Be aware of what patch you're working on. Use the \hgxcmd{mq}{qtop}
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1717 %command and skim over the text of your patches frequently---for
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1718 %example, using \hgcmdargs{tip}{\hgopt{tip}{-p}}---to be sure of where
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1719 %you stand. I have several times worked on and \hgxcmd{mq}{qrefresh}ed a
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1720 %patch other than the one I intended, and it's often tricky to migrate
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1721 %changes into the right patch after making them in the wrong one.
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1722
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1723 $B$I$N%Q%C%A$K$D$$$F:n6H$7$F$$$k$N$+GD0.$7$F$*$/$Y$-$G$"(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1724 $B$k!%(B\hgxcmd{mq}{qtop}$B%3%^%s%I$r;H$$!$%Q%C%A$rIQHK$K%A%'%C%/$9$Y$-$G$"$k!%(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1725 $B$^$?!$Nc$($P(B\hgcmdargs{tip}{\hgopt{tip}{-p}}$B$r;H$C$F!$$$$^$I$3$K$$$k$N$+(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1726 $B$rD4$Y$k$3$H$bI,MW$G$"$k!%0U?^$7$F$$$k%Q%C%A0J30$N%Q%C%A$K$D$$$F(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1727 \hgxcmd{mq}{qrefresh}$B$r9T$$!$4V0c$C$?%Q%C%A$K2C$($i$l$?JQ99$r@5$7$$%Q%C%A(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1728 $B$K0\F0$5$;$?!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1729
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1730 %For this reason, it is very much worth investing a little time to
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1731 %learn how to use some of the third-party tools I described in
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1732 %section~\ref{sec:mq:tools}, particularly \command{diffstat} and
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1733 %\command{filterdiff}. The former will give you a quick idea of what
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1734 %changes your patch is making, while the latter makes it easy to splice
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1735 %hunks selectively out of one patch and into another.
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1736
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1737 $B$3$N$?$a!$%;%/%7%g%s(B~\ref{sec:mq:tools}$B$G=R$Y$?%5!<%I%Q!<%F%#@=$N$$$/$D$+(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1738 $B$N%D!<%k!$FC$K(B\command{diffstat}$B$H(B\command{filterdiff}$B$N;H$$J}$r3X$V$N$O(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1739 $B$H$F$b0UL#$,$"$k!%A0<T$O!$$"$J$?$N%Q%C%A$,$I$N$h$&$JJQ99$r2C$($k$N$+B(:B(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1740 $B$KCN$k$3$H$,$G$-!$0lJ}$G8e<T$O%Q%C%A$NCf$N(Bhunk$B$rJL$N%Q%C%A$XA^F~$9$k$N$r(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1741 $BMF0W$K$9$k!%(B
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1742
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1743
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1744 %\section{MQ cookbook}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1745 \section{MQ$B%/%C%/%V%C%/(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1746
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1747 %\subsection{Manage ``trivial'' patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1748 \subsection{``$B%H%j%S%"%k(B''$B$J%Q%C%A$N4IM}(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1749
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1750 %Because the overhead of dropping files into a new Mercurial repository
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1751 %is so low, it makes a lot of sense to manage patches this way even if
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1752 %you simply want to make a few changes to a source tarball that you
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1753 %downloaded.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1754
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1755 $B%U%!%$%k$r(BMercurial$B%j%]%8%H%j$KDI2C$9$k%*!<%P%X%C%I$O>.$5$$!%$3$N$?$a!$$?(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1756 $B$H$(%=!<%9$N(Btar$B%"!<%+%$%V$X>/?t$NJQ99$r2C$($k$@$1$@$H$7$F$b!$%Q%C%A$r%j%](B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1757 $B%8%H%j$G4IM}$9$k$N$ONI$$J}K!$G$"$k!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1758
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1759 %Begin by downloading and unpacking the source tarball,
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1760 %and turning it into a Mercurial repository.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1761 %\interaction{mq.tarball.download}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1762
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1763 $B%=!<%9(Btarball$B$r%@%&%s%m!<%I$7$FE83+$7!$$3$l$r(BMercurial$B%j%]%8%H%j$KJQ49$9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1764 $B$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1765 \interaction{mq.tarball.download}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1766
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1767 %Continue by creating a patch stack and making your changes.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1768 %\interaction{mq.tarball.qinit}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1769
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1770 $B?7$?$J%Q%C%A%9%?%C%/$r:n$j!$JQ99$r9T$&!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1771 \interaction{mq.tarball.qinit}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1772
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1773 %Let's say a few weeks or months pass, and your package author releases
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1774 %a new version. First, bring their changes into the repository.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1775 %\interaction{mq.tarball.newsource}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1776 %The pipeline starting with \hgcmd{locate} above deletes all files in
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1777 %the working directory, so that \hgcmd{commit}'s
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1778 %\hgopt{commit}{--addremove} option can actually tell which files have
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1779 %really been removed in the newer version of the source.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1780
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1781 $B?t=54V$+$i?t%+7n7P$C$?;~!$%Q%C%1!<%8$N:n<T$,?7$7$$%P!<%8%g%s$r%j%j!<%9$7(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1782 $B$?$H$7$h$&!%$=$N>l9g!$$^$:?7$7$$%P!<%8%g%s$H$N:9J,$r%j%]%8%H%j$K<h$j9~$`!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1783 \interaction{mq.tarball.newsource}
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1784 \hgcmd{locate}$B$N=PNO$r%Q%$%W$G7R$$$G%o!<%-%s%0%G%#%l%/%H%j$N$9$Y$F$N%U%!(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1785 $B%$%k$r>C5n$7!$(B\hgcmd{commit}$B%3%^%s%I$N(B\hgopt{commit}{--addremove}$B%*%W%7%g(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1786 $B%s$r;H$C$F<B:]$K$I$N%U%!%$%k$,?7$7$$%P!<%8%g%s$N%=!<%9$G:o=|$5$l$?$N$+;X(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1787 $BDj$9$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1788
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1789 %Finally, you can apply your patches on top of the new tree.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1790 %\interaction{mq.tarball.repush}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1791
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1792 $B:G8e$K%Q%C%A$r?7$7$$%D%j!<$KE,MQ$9$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1793 \interaction{mq.tarball.repush}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1794
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1795 %\subsection{Combining entire patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1796 \subsection{$B%Q%C%AF1;N$r7k9g$9$k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1797 \label{sec:mq:combine}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1798
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1799 %MQ provides a command, \hgxcmd{mq}{qfold} that lets you combine entire
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1800 %patches. This ``folds'' the patches you name, in the order you name
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1801 %them, into the topmost applied patch, and concatenates their
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1802 %descriptions onto the end of its description. The patches that you
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1803 %fold must be unapplied before you fold them.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1804
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1805 MQ$B$K$O%Q%C%AA4BN$r7k9g$9$k(B\hgxcmd{mq}{qfold}$B$H$$$&%3%^%s%I$,$"$k!%$3$N%3(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1806 $B%^%s%I$OL>A0$r$D$1$?%Q%C%A$rL>IU$1$?=gHV$G:F>e0L$NE,MQ:Q$_%Q%C%A$K>v$_9~(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1807 $B$`!%3F!9$N%Q%C%A$N@bL@$O7k9g$5$l$F%Q%C%A$N@bL@$NKvHx$KDI2C$5$l$k!%>v$_9~(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1808 $B$`%Q%C%A$O$9$G$KE,MQ$5$l$F$$$F$O$J$i$J$$!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1809
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1810 %The order in which you fold patches matters. If your topmost applied
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1811 %patch is \texttt{foo}, and you \hgxcmd{mq}{qfold} \texttt{bar} and
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1812 %\texttt{quux} into it, you will end up with a patch that has the same
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1813 %effect as if you applied first \texttt{foo}, then \texttt{bar},
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1814 %followed by \texttt{quux}.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1815
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1816 $B%Q%C%A$r>v$_9~$`=gHV$O=EMW$G$"$k!%:#!$:F>e0L$NE,MQ:Q$_%Q%C%A$,(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1817 \texttt{foo}$B$@$H$7$F!$(B\hgxcmd{mq}{qfold} \texttt{bar}$B$H(B\texttt{quux}$B$r9T(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1818 $B$&$H!$%Q%C%A$O(B\texttt{foo}, then \texttt{bar}, \texttt{quux}$B$N=gHV$G%Q%C(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1819 $B%A$rE,MQ$7$?$N$HF1$88z2L$r;}$D$3$H$K$J$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1820
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1821 %\subsection{Merging part of one patch into another}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1822 \subsection{$B%Q%C%A$N0lItJ,$rJL$N%Q%C%A$X%^!<%8$9$k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1823
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
1824 %Merging \emph{part} of one patch into another is more difficult than
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
1825 %combining entire patches.
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
1826
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1827 $B%Q%C%A$N(B\emph{$B0lIt(B}$B$rJL$N%Q%C%A$X%^!<%8$9$k$3$H$O!$%Q%C%A$r7k9g$9$k$h$j$O(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1828 $BFq$7$$!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1829
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1830 %If you want to move changes to entire files, you can use
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1831 %\command{filterdiff}'s \cmdopt{filterdiff}{-i} and
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1832 %\cmdopt{filterdiff}{-x} options to choose the modifications to snip
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1833 %out of one patch, concatenating its output onto the end of the patch
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1834 %you want to merge into.You usually won't need to modify the patch
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1835 %you've merged the changes from. Instead, MQ will report some rejected
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1836 %hunks when you \hgxcmd{mq}{qpush} it (from the hunks you moved into the
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1837 %other patch), and you can simply \hgxcmd{mq}{qrefresh} the patch to drop
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1838 %the duplicate hunks.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1839
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1840 $BJQ99$r%U%!%$%k$N=89gA4BN$K0\F0$9$k>l9g!$(B\command{filterdiff}$B$K(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1841 \cmdopt{filterdiff}{-i}$B$H(B\cmdopt{filterdiff}{-x}$B$rIU$1!$(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1842 $B0l$D$N%Q%C%A$+$i<h$k5n$kJQ99!$%Q%C%A$NKvHx$K7k9g$9$kJQ99$rA*$V!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1843 $BDL>o$N>l9g!$JQ99$r<h$j=P$7$?%Q%C%A$rJQ99$9$kI,MW$O$J$$!%$=$NBe$o$j!$(BMQ$B$O(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1844 ($BB>$N%Q%C%A$K0\F0$7$?(Bhunk$B$+$i(B)\hgxcmd{mq}{qpush}$B$7$?;~$K%j%8%'%/%H$5$l$?(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1845 hunk$B$rJs9p$9$k!%(B
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
1846
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1847 %If you have a patch that has multiple hunks modifying a file, and you
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1848 %only want to move a few of those hunks, the job becomes more messy,
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1849 %but you can still partly automate it. Use \cmdargs{lsdiff}{-nvv} to
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1850 %print some metadata about the patch.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1851 %\interaction{mq.tools.lsdiff}
337
b8791971ba65 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 335
diff changeset
1852
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1853 $B%Q%C%A$K0l$D$N%U%!%$%k$rJQ99$9$kJ#?t$N(Bhunk$B$,$"$j!$$=$NCf$N0lIt$r0\F0$7$?(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1854 $B$$>l9g$O!$:n6H$O$b$C$H$d$d$3$7$$$b$N$K$J$k$,!$0MA3$H$7$F0lIt$O<+F02=$9$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1855 $B$3$H$,$G$-$k!%(B\cmdargs{lsdiff}{-nvv}$B%3%^%s%I$G%Q%C%A$N%a%?%G!<%?$rI=<($9(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1856 $B$k!%(B\interaction{mq.tools.lsdiff}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1857
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1858 %This command prints three different kinds of number:
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1859 $B$3$N%3%^%s%I$O(B3$B$D$N0[$J$kHV9f$r=PNO$9$k(B:
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1860 \begin{itemize}
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1861 %\item (in the first column) a \emph{file number} to identify each file
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1862 % modified in the patch;
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1863 \item ($B:G=i$NNs(B) $B$3$N%Q%C%A$GJQ99$5$l$k%U%!%$%k$r<1JL$9$k$?$a$N(B\emph{$B%U%!(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1864 $B%$%kHV9f(B}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1865 %\item (on the next line, indented) the line number within a modified
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1866 % file where a hunk starts; and
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1867 \item ($B<!$N9T$G%$%s%G%s%H$5$l$F$$$k(B) $BJQ99$5$l$?%U%!%$%k$NCf$G(Bhun$B$,;O$^$k(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1868 $B9THV9f(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1869 %\item (on the same line) a \emph{hunk number} to identify that hunk.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1870 \item ($B$=$l$HF1$89T(B) $BEv3:(Bhunk$B$r<1JL$9$k(B\emph{hunk$BHV9f(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1871 \end{itemize}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1872
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1873 %You'll have to use some visual inspection, and reading of the patch,
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1874 %to identify the file and hunk numbers you'll want, but you can then
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1875 %pass them to to \command{filterdiff}'s \cmdopt{filterdiff}{--files}
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1876 %and \cmdopt{filterdiff}{--hunks} options, to select exactly the file
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1877 %and hunk you want to extract.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1878
346
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1879 $BI,MW$J%U%!%$%k$H(Bhunk$BHV9f$r8+$D$1$k$?$a$K!$%Q%C%A$rFI$`$J$I$7$FL\;k$G3NG'(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1880 $B$9$kI,MW$,$"$k!%$=$NHV9f$O!$(Bextract$B$9$k%U%!%$%k$H(Bhunk$B$rA*$V$?$a$K(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1881 \command{filterdiff}$B%3%^%s%I$N(B\cmdopt{filterdiff}{--files}$B$H(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1882 \cmdopt{filterdiff}{--hunks}$B%*%W%7%g%s$G;H$($k!%(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1883
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1884 %Once you have this hunk, you can concatenate it onto the end of your
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1885 %destination patch and continue with the remainder of
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1886 %section~\ref{sec:mq:combine}.
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1887
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1888 $B$3$N(Bhunk$B$,$G$-$?$i!$L\E*$N%Q%C%A$NKvHx$K7k9g$7!$%;%/%7%g%s$N;D$j$NItJ,$r(B
0b99bf82b573 more mq.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 345
diff changeset
1889 $BB3$1$k$3$H$,$G$-$k(B~\ref{sec:mq:combine}$B!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1890
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1891 %\section{Differences between quilt and MQ}
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1892 \section{quilt$B$H(BMQ$B$N0c$$(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1893
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1894 %If you are already familiar with quilt, MQ provides a similar command
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1895 %set. There are a few differences in the way that it works.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1896
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1897 $B$9$G$K(Bquilt$B$KFk@w$s$G$$$k%f!<%6$N$?$a$K!$(BMQ$B$OF1MM$N%3%^%s%I%;%C%H$rMQ0U(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1898 $B$7$F$$$k!%%3%^%s%I$N5sF0$K$O2?E@$+0c$$$,$"$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1899
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1900 %You will already have noticed that most quilt commands have MQ
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1901 %counterparts that simply begin with a ``\texttt{q}''. The exceptions
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1902 %are quilt's \texttt{add} and \texttt{remove} commands, the
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1903 %counterparts for which are the normal Mercurial \hgcmd{add} and
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1904 %\hgcmd{remove} commands. There is no MQ equivalent of the quilt
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1905 %\texttt{edit} command.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1906
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1907 $B$9$G$K$[$H$s$I$N(Bquilt$B%3%^%s%I$K$O!$BP1~$9$k(B``\texttt{q}''$B$G;O$^$k(BMQ$B%3%^%s(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1908 $B%I$,$"$k$3$H$K5$$E$$$F$$$k$3$H$H;W$&!%Nc30$O!$(Bquilt$B$N(B\texttt{add}$B%3%^%s%I(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1909 $B$H(B\texttt{remove}$B%3%^%s%I$G!$$3$l$i$K$O$=$l$>$lDL>o$N(BMercurial$B%3%^%s%I$N(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1910 \hgcmd{add}$B$H(B\hgcmd{remove}$B$,BP1~$9$k!%$^$?!$(Bquilt$B$N(B\texttt{edit}$B%3%^%s%I(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1911 $B$KBP1~$9$k(BMQ$B%3%^%s%I$O$J$$!%(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1912
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1913 %%% Local Variables:
293
3b1291f24c0d - replaved latex-mode to yatex-mode
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 290
diff changeset
1914 %%% mode: yatex
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1915 %%% TeX-master: "00book"
347
b3e736000aef completed mq.tex.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 346
diff changeset
1916 %%% End: