Mercurial > hgbook
annotate ja/undo.tex @ 837:b775f963b18c
Clean up chapter 8, and add content
propagate 7226e5e750a6
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 15 Sep 2009 22:32:03 +0900 |
parents | 8a3041e6f3cb |
children |
rev | line source |
---|---|
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
1 %\chapter{Finding and fixing your mistakes} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
2 \chapter{$B%_%9$NH/8+$H=$@5(B} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 \label{chap:undo} |
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
5 %To err might be human, but to really handle the consequences well |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
6 %takes a top-notch revision control system. In this chapter, we'll |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
7 %discuss some of the techniques you can use when you find that a |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
8 %problem has crept into your project. Mercurial has some highly |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
9 %capable features that will help you to isolate the sources of |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
10 %problems, and to handle them appropriately. |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
12 $B%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$K$O?M$NHH$7$?4V0c$$$r$&$^$/=hM}$9$k5!G=$,(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
13 $B5a$a$i$l$F$$$k!%$3$N>O$G$O!$%W%m%8%'%/%H$K5/$3$jF@$kLdBj$N2r7h$KMxMQ2DG=(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
14 $B$J%F%/%K%C%/$K$D$$$F=R$Y$k!%(BMercurial$B$K$OLdBj$N$"$k%=!<%9$r@Z$jJ,$1!$=hM}(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
15 $B$9$k6/NO$J5!G=$,$"$k!%(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
16 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
17 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
18 %\section{Erasing local history} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
19 \section{$B%m!<%+%k%R%9%H%j!<$r>C5n$9$k(B} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
21 %\subsection{The accidental commit} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
22 \subsection{$B%"%/%7%G%s%H$K$h$k%3%_%C%H(B} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
23 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
24 %I have the occasional but persistent problem of typing rather more |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
25 %quickly than I can think, which sometimes results in me committing a |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
26 %changeset that is either incomplete or plain wrong. In my case, the |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
27 %usual kind of incomplete changeset is one in which I've created a new |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
28 %source file, but forgotten to \hgcmd{add} it. A ``plain wrong'' |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
29 %changeset is not as common, but no less annoying. |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
31 $BI.<T$K$O%?%$%T%s%0Cf$K9M$($k$h$j$b@h$K;X$,F0$$$F$7$^$&JJ$,0JA0$+$i$"$j!$(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
32 $B$?$^$K$3$l$,5/$-$k$H!$IT40A4$@$C$?$j4V0c$C$?FbMF$N%A%'%s%8%;%C%H$r%3%_%C(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
33 $B%H$7$F$7$^$&!%I.<T$N>l9g!$IT40A4$J%A%'%s%8%;%C%H$NE57?$O?7$7$$%=!<%9%U%!(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
34 $B%$%k$r:n@.$7$?$N$K(B\hgcmd{add}$B$rK:$l$k$3$H$G!$(B``$B4V0c$C$?FbMF(B''$B$N%3%_%C%H(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
35 $B$O$"$^$j5/$-$J$$$,!$$d$O$jF1$8$h$&$KLq2p$G$"$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
36 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
37 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
38 %\subsection{Rolling back a transaction} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
39 \subsection{$B%H%i%s%6%/%7%g%s$N%m!<%k%P%C%/(B} |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
40 \label{sec:undo:rollback} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
41 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
42 %In section~\ref{sec:concepts:txn}, I mentioned that Mercurial treats |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
43 %each modification of a repository as a \emph{transaction}. Every time |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
44 %you commit a changeset or pull changes from another repository, |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
45 %Mercurial remembers what you did. You can undo, or \emph{roll back}, |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
46 %exactly one of these actions using the \hgcmd{rollback} command. (See |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
47 %section~\ref{sec:undo:rollback-after-push} for an important caveat |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
48 %about the use of this command.) |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
49 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
50 \ref{sec:concepts:txn}$B@a$G!$(BMercurial$B$O%j%]%8%H%j$X$N8D!9$NJQ99$r(B\emph{$B%H(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
51 $B%i%s%6%/%7%g%s(B}$B$H$7$F07$&$H$$$&$3$H$r=R$Y$?!%(BMercurial$B$O!$JL$N%j%]%8%H%j(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
52 $B$X$N%A%'%s%8%;%C%H$N%3%_%C%H$dJQ99$N(Bpull$B$r5-21$7$F$$$k!%%f!<%6$O(Bundo$B$7$?(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
53 $B$j!$0l2s$K8B$j%"%/%7%g%s$r(B\hgcmd{rollback}$B%3%^%s%I$G(B\emph{$B%m!<%k%P%C%/(B}$B$9(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
54 $B$k$3$H$,$G$-$k!%(B($B$3$N%3%^%s%I$N=EMW$J@)Ls$K$D$$$F$O(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
55 \ref{sec:undo:rollback-after-push}$B$r;2>H$N$3$H!%(B) |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
56 |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
57 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
58 %Here's a mistake that I often find myself making: committing a change |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
59 %in which I've created a new file, but forgotten to \hgcmd{add} it. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
60 %\interaction{rollback.commit} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
61 %Looking at the output of \hgcmd{status} after the commit immediately |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
62 %confirms the error. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
63 %\interaction{rollback.status} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
64 %The commit captured the changes to the file \filename{a}, but not the |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
65 %new file \filename{b}. If I were to push this changeset to a |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
66 %repository that I shared with a colleague, the chances are high that |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
67 %something in \filename{a} would refer to \filename{b}, which would not |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
68 %be present in their repository when they pulled my changes. I would |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
69 %thus become the object of some indignation. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
70 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
71 $BI.<T$,NI$/5/$3$9%_%9$O!$?7$7$$%U%!%$%k$r:n@.$7$?%A%'%s%8%;%C%H$r%3%_%C%H(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
72 $B$9$k;~$K(B\hgcmd{add}$B$N<B9T$rK:$l$k$b$N$G$"$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
73 \interaction{rollback.commit} |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
74 $B%3%_%C%H8e$N(B\hgcmd{status}$B$N=PNO$r8+$k$H!$D>$A$K%(%i!<$rI=<($7$F$$$k$3$H(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
75 $B$,$o$+$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
76 \interaction{rollback.status} |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
77 $B%3%_%C%H$O(B\filename{a}$B$X$NJQ99$r4^$s$G$$$k$,!$(B\filename{b}$B$X$NJQ99$O4^$s(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
78 $B$G$$$J$$!%$3$3$G;d$,F1N=$H6&M-$7$F$$$k%j%]%8%H%j$X%A%'%s%8%;%C%H$N%W%C%7%e(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
79 $B$r9T$C$?$H$7$?$i!$H`$i$,JQ99$r%W%k$7$?;~!$(B\filename{a}$B$NCf$N2?$+$,H`$i(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
80 $B$N%j%]%8%H%j$K4^$^$l$J$$(B\filename{b}$B$X$N;2>H$r9T$&2DG=@-$O9b$$!%$=$&$J$C(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
81 $B$?$iI.<T$OF1N=$NE\$j$rGc$&$3$H$K$J$k$@$m$&!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
82 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
83 %However, luck is with me---I've caught my error before I pushed the |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
84 %changeset. I use the \hgcmd{rollback} command, and Mercurial makes |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
85 %that last changeset vanish. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
86 %\interaction{rollback.rollback} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
87 %Notice that the changeset is no longer present in the repository's |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
88 %history, and the working directory once again thinks that the file |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
89 %\filename{a} is modified.The commit and rollback have left the |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
90 %working directory exactly as it was prior to the commit; the changeset |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
91 %has been completely erased. I can now safely \hgcmd{add} the file |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
92 %\filename{b}, and rerun my commit. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
93 %\interaction{rollback.add} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
94 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
95 $B$7$+$79%1?$K$b%A%'%s%8%;%C%H$r%W%C%7%e$9$kA0$K%(%i!<$K5$$E$$$?>l9g!$(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
96 \hgcmd{rollback}$B%3%^%s%I$r;HMQ$9$k$3$H$G(BMercurial$B$+$i:G8e$N99?7$r<h$j=|(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
97 $B$/$3$H$,$G$-$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
98 \interaction{rollback.rollback} |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
99 $B%A%'%s%8%;%C%H$O%j%]%8%H%j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
100 $B$N(B\filename{a}$B$OJQ99$5$l$?$HG'<1$5$l$k!%%3%_%C%H$7$F%m!<%k%P%C%/$9$k$H!$(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
101 $B%o!<%-%s%0%G%#%l%/%H%j$O40A4$K%3%_%C%HA0$N>uBV$K$J$j!$%A%'%s%8%;%C%H$O40(B |
348
32d33b238b7e
made changes to the source files to be compiled at any rate.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
314
diff
changeset
|
102 $BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hgcmd{add} \filename{b}$B$7!$$b$&0lEY(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
103 commit$B$9$k$3$H$,$G$-$k!%(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
104 \interaction{rollback.rollback} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
105 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
106 %\subsection{The erroneous pull} |
305 | 107 \subsection{$B8m$C$?%W%k(B} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
108 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
109 %It's common practice with Mercurial to maintain separate development |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
110 %branches of a project in different repositories. Your development |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
111 %team might have one shared repository for your project's ``0.9'' |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
112 %release, and another, containing different changes, for the ``1.0'' |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
113 %release. |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
114 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
115 Mercurial$B$r;H$C$FJL!9$N3+H/%V%i%s%A$rJL!9$N%j%]%8%H%j$G4IM}$9$k$3$H$,$h$/(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
116 $B$"$k!%$"$J$?$N3+H/%A!<%`$O%W%m%8%'%/%H$N%j%j!<%9(B0.9$B$N$?$a$K(B1$B$D$N6&M-%j%](B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
117 $B%8%H%j$r;}$A!$%j%j!<%9(B1.0$B$N$?$a$K0[$J$kJQ99$r;}$C$?$b$&0l$DJL$N%j%]%8%H(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
118 $B%j$r$b$C$F$$$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
119 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
120 %Given this, you can imagine that the consequences could be messy if |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
121 %you had a local ``0.9'' repository, and accidentally pulled changes |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
122 %from the shared ``1.0'' repository into it. At worst, you could be |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
123 %paying insufficient attention, and push those changes into the shared |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
124 %``0.9'' tree, confusing your entire team (but don't worry, we'll |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
125 %return to this horror scenario later). However, it's more likely that |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
126 %you'll notice immediately, because Mercurial will display the URL it's |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
127 %pulling from, or you will see it pull a suspiciously large number of |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
128 %changes into the repository. |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
129 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
130 $B$3$3$G$"$J$?$O8m$C$F%m!<%+%k$N(B0.9$B%j%]%8%H%j$K6&M-(B1.0$B%j%]%8%H%j$+$i%W%k$7(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
131 $B$?$H$9$k!%:G0-$N>l9g!$Cm0U$rBU$C$F!$$3$l$r6&M-$N(B0.9$B%j%]%8%H%j$K=q$-La$7$F(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
132 $B$7$^$$!$3+H/%A!<%`A4BN$r:.Mp$5$;$F$7$^$&$3$H$,M-$jF@$k!%!J$3$N>l9g$I$&$9(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
133 $B$l$P$$$$$N$+$K$D$$$F$O8e=R$9$k!%!K<B:]$K$O!$(BMercurial$B$O(Bpull$B85$N(BURL$B$rI=<((B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
134 $B$9$k$7!$4V0c$C$?%j%]%8%H%j$+$i(Bpull$B$9$l$PBgNL$N%A%'%s%8%;%C%H$,I=<($5$l$k(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
135 $B$?$a!$B(:B$K2?$+$,$*$+$7$$$H5$$E$/$3$H$@$m$&!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
136 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
137 %The \hgcmd{rollback} command will work nicely to expunge all of the |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
138 %changesets that you just pulled. Mercurial groups all changes from |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
139 %one \hgcmd{pull} into a single transaction, so one \hgcmd{rollback} is |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
140 %all you need to undo this mistake. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
141 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
142 \hgcmd{rollback}$B%3%^%s%I$r<B9T$9$l$P!$:#%W%k$7$?$P$+$j$N%A%'%s%8%;%C%H$r(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
143 $BA4$F>C5n$9$k$3$H$,$G$-$k!%(BMercurial$B$O0l2s(B\hgcmd{pull}$B$K$h$k%H%i%s%6%/%7%g(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
144 $B%s$G$b$?$i$5$l$?A4$F$N%A%'%s%8%;%C%H$r%0%k!<%W2=$7$F$$$k$N$G!$(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
145 \hgcmd{rollback}$B$r0lEY<B9T$9$k$@$1$G!$%_%9$rA4$F$d$jD>$9$3$H$,$G$-$k!%(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
146 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
147 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
148 %\subsection{Rolling back is useless once you've pushed} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
149 \subsection{$B0lEY%W%C%7%e$7$?8e$G$O%m!<%k%P%C%/$G$-$J$$(B} |
200
9bba958be4c6
Mention automatic example generation.
Bryan O'Sullivan <bos@serpentine.com>
parents:
131
diff
changeset
|
150 \label{sec:undo:rollback-after-push} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
151 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
152 %The value of the \hgcmd{rollback} command drops to zero once you've |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
153 %pushed your changes to another repository. Rolling back a change |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
154 %makes it disappear entirely, but \emph{only} in the repository in |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
155 %which you perform the \hgcmd{rollback}. Because a rollback eliminates |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
156 %history, there's no way for the disappearance of a change to propagate |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
157 %between repositories. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
158 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
159 $BB>$N%j%]%8%H%j$KJQ99$r%W%C%7%e$7$?8e$G$O(B\hgcmd{rollback}$B$N2ACM$O%<%m$G$"(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
160 $B$k!%JQ99$r%m!<%k%P%C%/$9$k$3$H$K$h$C$FJQ99$O40A4$K>CLG$9$k$,!$$=$l$O$"$J(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
161 $B$?$,(B\hgcmd{rollback}$B$r<B9T$7$?%j%]%8%H%j$K8B$C$F$N$3$H$G$"$k!%%m!<%k%P%C(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
162 $B%/$K$h$C$F!JJQ99$N!KMzNr<+BN$,$J$+$C$?$3$H$K$J$k$N$G!$JQ99$N>CLG$rB>$N%j(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
163 $B%]%8%H%j$KGH5Z$5$;$k<jCJ$O$J$$!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
164 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
165 %If you've pushed a change to another repository---particularly if it's a |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
166 %shared repository---it has essentially ``escaped into the wild,'' and |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
167 %you'll have to recover from your mistake in a different way. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
168 %If you push a changeset somewhere, then roll it back, then pull from the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
169 %repository you pushed to, the changeset you thought you'd gotten rid of |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
170 %will simply reappear in your repository. |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
171 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
172 $B$b$7$"$J$?$,B>$N%j%]%8%H%j!JFC$K6&M-%j%]%8%H%j!K$KJQ99$r%W%C%7%e$7$F$$$k(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
173 $B$N$J$i!$:$$C$?;vBV$,5/$3$C$F$*$j!$JL$NJ}K!$G%_%9$+$iI|5l$9$kI,MW$,$"$k!%(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
174 $B%A%'%s%8%;%C%H$r$I$3$+$X%W%C%7%e$7$?8e$G%m!<%k%P%C%/$7!$%W%C%7%e@h$N%j%](B |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
175 $B%8%H%j$+$i:F$S%W%k$7$?>l9g!$:o=|$7$?$D$b$j$N%A%'%s%8%;%C%H$,%m!<%+%k%j%](B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
176 $B%8%H%j$K:F$S8=$l$k!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
177 |
305 | 178 %(If you absolutely know for sure that the change you want to roll back |
179 %is the most recent change in the repository that you pushed to, | |
180 %\emph{and} you know that nobody else could have pulled it from that | |
181 %repository, you can roll back the changeset there, too, but you really | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
182 %should not expect this to work reliably. Sooner or later a change |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
183 %really will make it into a repository that you don't directly control |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
184 %(or have forgotten about), and come back to bite you.) |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
185 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
186 $B!J$b$7%m!<%k%P%C%/$7$?$$%A%'%s%8%;%C%H$,%W%C%7%e@h$N%j%]%8%H%j$G:G?7$G$"(B |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
187 $B$j!$$+$D!$C/$b$=$l$r%W%k$7$F$$$J$$$3$H$,3N<B$J>l9g$O!$%W%C%7%e@h$N%j%]%8(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
188 $B%H%j$G%m!<%k%P%C%/$9$k$3$H$,2DG=$G$"$k!%$7$+$7$3$NJ}K!$K$O3N<B@-$,$J$$$H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
189 $B$$$&$3$H$r4N$KL?$8$F$*$/$Y$-$G$"$k!%$3$NJ}K!$OD>@\%3%s%H%m!<%k$G$-$J$+$C(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
190 $B$?$j!$$=$NJ}K!$rK:$l$F$7$^$C$?%j%]%8%H%j$X$NJQ99$N=$@5$K$O;H$($J$$!%!K(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
191 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
192 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
193 %\subsection{You can only roll back once} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
194 \subsection{$B%m!<%k%P%C%/$O0l2s$N$_(B} |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
195 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
196 %Mercurial stores exactly one transaction in its transaction log; that |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
197 %transaction is the most recent one that occurred in the repository. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
198 %This means that you can only roll back one transaction. If you expect |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
199 %to be able to roll back one transaction, then its predecessor, this is |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
200 %not the behaviour you will get. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
201 %\interaction{rollback.twice} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
202 %Once you've rolled back one transaction in a repository, you can't |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
203 %roll back again in that repository until you perform another commit or |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
204 %pull. |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
205 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
206 Mercurial$B$O%H%i%s%6%/%7%g%s%m%0$K$=$N%j%]%8%H%j$K5/$3$C$?:G$b?7$7$$%H%i%s(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
207 $B%6%/%7%g%s0l2sJ,$N$_$r5-O?$7$F$$$k!%%m!<%k%P%C%/0l2sKh$K0l$DA0$N%j%S%8%g(B |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
208 $B%s$KLa$k$o$1$G$O$J$$!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
209 \interaction{rollback.twice} |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
210 $B%j%]%8%H%jFb$G0lEY%m!<%k%P%C%/$7$?$i!$JL$N%3%_%C%H$r$9$k$+%W%k$r$9$k$^(B |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
211 $B$G%m!<%k%P%C%/$O$G$-$J$$!%(B |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
212 |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
213 |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
214 %\section{Reverting the mistaken change} |
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
215 \section{$B4V0c$C$?JQ99$r85$KLa$9(B} |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
216 |
297 | 217 %If you make a modification to a file, and decide that you really |
218 %didn't want to change the file at all, and you haven't yet committed | |
219 %your changes, the \hgcmd{revert} command is the one you'll need. It | |
220 %looks at the changeset that's the parent of the working directory, and | |
221 %restores the contents of the file to their state as of that changeset. | |
222 %(That's a long-winded way of saying that, in the normal case, it | |
223 %undoes your modifications.) | |
224 | |
225 $B%U%!%$%k$KJQ99$r2C$($?8e$G!$JQ99$,I,MW$G$J$$$HJ,$+$j!$$^$@%3%_%C%H$5$l$F(B | |
226 $B$$$J$$;~$O(B\hgcmd{revert}$B%3%^%s%I$r;H$&$3$H$,$G$-$k!%$3$N%3%^%s%I$O%o!<%-(B | |
227 $B%s%0%G%#%l%/%H%j$N?F%A%'%s%8%;%C%H$r;2>H$7!$%U%!%$%k$NFbMF$r%A%'%s%8%;%C(B | |
228 $B%H$N>uBV$KLa$9!%!J$3$l$O$"$J$?$,2C$($?JQ99$r$/$I$/$I$7$/=R$Y$?$b$N$G$"(B | |
229 $B$k!%!K(B | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
230 |
297 | 231 %Let's illustrate how the \hgcmd{revert} command works with yet another |
232 %small example. We'll begin by modifying a file that Mercurial is | |
233 %already tracking. | |
234 %\interaction{daily.revert.modify} | |
235 %If we don't want that change, we can simply \hgcmd{revert} the file. | |
236 %\interaction{daily.revert.unmodify} | |
237 %The \hgcmd{revert} command provides us with an extra degree of safety | |
238 %by saving our modified file with a \filename{.orig} extension. | |
239 %\interaction{daily.revert.status} | |
240 | |
241 \hgcmd{revert}$B%3%^%s%I$,$I$N$h$&$KF0:n$9$k$+!$JL$N>.$5$JNc$G@bL@$9$k!%(B | |
242 $B$9$G$K(BMercurial$B$,4IM}$7$F$$$k%U%!%$%k$rJQ99$7$?$H$3$m$+$i;O$a$k!%(B | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
243 \interaction{daily.revert.modify} |
297 | 244 $B$3$NJQ99$,I,MW$G$J$$>l9g!$C1$K%U%!%$%k$K(B\hgcmd{revert}$B$r<B9T$9$l$P$h$$!%(B |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
245 \interaction{daily.revert.unmodify} |
297 | 246 \hgcmd{revert}$B%3%^%s%I$O0BA4$N$?$a(B\filename{.orig}$B$H$$$&%U%!%$%kL>$GJQ99(B |
247 $B$r%;!<%V$9$k!%(B | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
248 \interaction{daily.revert.status} |
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
249 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
250 \begin{note} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
251 %Be careful with \filename{.orig} files |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
252 \filename{.orig}$B%U%!%$%k$KCm0U(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
253 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
254 %It's extremely unlikely that you are either using Mercurial to manage |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
255 %files with \filename{.orig} extensions or that you even care about the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
256 %contents of such files. Just in case, though, it's useful to remember |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
257 %that \hgcmd{revert} will unconditionally overwrite an existing file with |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
258 %a \filename{.orig} extension. For instance, if you already have a file |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
259 %named \filename{foo.orig} when you revert \filename{foo}, the contents |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
260 %of \filename{foo.orig} will be clobbered. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
261 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
262 \filename{.orig}$B$H$$$&3HD%;R$r;}$D%U%!%$%k$r(BMercurial$B$G4IM}$7$?$j!$$=$NFb(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
263 $BMF$K4X?4$r;}$D$3$H$O$*$=$i$/$[$H$s$I$J$$$@$m$&!%$=$&$G$J$$>l9g$O(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
264 \hgcmd{revert}$B$,L5>r7o$K3HD%;R(B\filename{.orig}$B$N%U%!%$%k$r>e=q$-$9$k$3$H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
265 $B$KN10U$9$Y$-$G$"$k!%Nc$r5s$2$k$H(B\filename{foo.orig}$B$H$$$&%U%!%$%k$,$"$k$H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
266 $B$-!$(B\filename{foo}$B$r(Brevert$B$9$k$H(B\filename{foo.orig}$B$NCf?H$OB;$J$o$l$F$7$^(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
267 $B$&!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
268 \end{note} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
269 |
297 | 270 %Here is a summary of the cases that the \hgcmd{revert} command can |
271 %deal with. We will describe each of these in more detail in the | |
272 %section that follows. | |
273 %\begin{itemize} | |
274 %\item If you modify a file, it will restore the file to its unmodified | |
275 % state. | |
276 %\item If you \hgcmd{add} a file, it will undo the ``added'' state of | |
277 % the file, but leave the file itself untouched. | |
278 %\item If you delete a file without telling Mercurial, it will restore | |
279 % the file to its unmodified contents. | |
280 %\item If you use the \hgcmd{remove} command to remove a file, it will | |
281 % undo the ``removed'' state of the file, and restore the file to its | |
282 % unmodified contents. | |
283 %\end{itemize} | |
284 | |
285 \hgcmd{revert}$B%3%^%s%I$,07$($k%1!<%9$K$D$$$F$^$H$a$k!%$h$j>\$7$$@bL@$O!$(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
286 $B8e$N@a$G9T$&!%(B |
297 | 287 |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
288 \begin{itemize} |
297 | 289 \item $B%U%!%$%k$rJQ99$7$?>l9g!$(B\hgcmd{revert}$B$O%U%!%$%k$rJQ99$5$l$kA0$N>u(B |
290 $BBV$KLa$9!%(B | |
291 \item \hgcmd{add}$B$r<B9T$7$?>l9g!$(B\hgcmd{revert}$B$O(Badd$B$r<h$j>C$9$,!$%U%!%$(B | |
292 $B%k<+BN$O$=$N$^$^<j$r?($l$:$K;D$9!%(B | |
293 \item Mercurial$B$rA`:n$;$:$K%U%!%$%k$r>C5n$7$F$$$?>l9g!$(B\hgcmd{revert}$B$O(B | |
294 $B%U%!%$%k$rJQ99A0$N>uBV$GI|85$9$k(B | |
295 \item \hgcmd{remove}$B%3%^%s%I$G%U%!%$%k$r>C5n$7$F$$$?>l9g!$JQ99A0$N>uBV$G(B | |
296 $B%U%!%$%k$rI|85$9$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
297 \end{itemize} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
298 |
297 | 299 |
300 %\subsection{File management errors} | |
301 \subsection{$B%U%!%$%k4IM}$N%_%9(B} | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
302 \label{sec:undo:mgmt} |
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
303 |
298 | 304 %The \hgcmd{revert} command is useful for more than just modified |
305 %files. It lets you reverse the results of all of Mercurial's file | |
306 %management commands---\hgcmd{add}, \hgcmd{remove}, and so on. | |
307 | |
308 \hgcmd{revert}$B%3%^%s%I$OC1$KJQ99$7$?%U%!%$%k$rLa$9$@$1$G$J$/!$(B | |
309 \hgcmd{add}$B!$(B\hgcmd{remove}$B$H$$$C$?(BMercurial$B$N%U%!%$%kA`:n%3%^%s%I$N7k2L(B | |
310 $B$r<h$j>C$9$3$H$,$G$-$k!%(B | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
311 |
298 | 312 %If you \hgcmd{add} a file, then decide that in fact you don't want |
313 %Mercurial to track it, use \hgcmd{revert} to undo the add. Don't | |
314 %worry; Mercurial will not modify the file in any way. It will just | |
315 %``unmark'' the file. | |
316 %\interaction{daily.revert.add} | |
317 | |
318 \hgcmd{add}$B$G%U%!%$%k$rDI2C$7$?8e$G!$(BMercurial$B$KDI@W$5$;$kI,MW$,$J$$$HJ,(B | |
319 $B$+$C$?;~!$(B\hgcmd{revert}$B$G(Badd$B$r<h$j>C$9$3$H$,$G$-$k!%(B\hgcmd{revert}$B$O%U%!(B | |
320 $B%$%k$N%^!<%/$r>C$9$@$1$G!$%U%!%$%k$NCf?H$O0l@ZJQ99$7$J$$$N$G?4G[$9$kI,MW(B | |
321 $B$O$J$$!%(B | |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
322 \interaction{daily.revert.add} |
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
323 |
298 | 324 %Similarly, if you ask Mercurial to \hgcmd{remove} a file, you can use |
325 %\hgcmd{revert} to restore it to the contents it had as of the parent | |
326 %of the working directory. | |
327 %\interaction{daily.revert.remove} | |
328 %This works just as well for a file that you deleted by hand, without | |
329 %telling Mercurial (recall that in Mercurial terminology, this kind of | |
330 %file is called ``missing''). | |
331 %\interaction{daily.revert.missing} | |
332 | |
299 | 333 $BF1MM$K!$(B\hgcmd{remove}$B%3%^%s%I$G%U%!%$%k$r>C5n$7$?;~!$(B\hgcmd{revert}$B%3%^(B |
334 $B%s%I$G%o!<%-%s%0%G%#%l%/%H%j$N?F$NFbMF$K%U%!%$%k$rI|85$9$k$3$H$,$G$-$k!%(B | |
335 \interaction{daily.revert.remove} | |
336 $B$^$?(BMercurial$B$r;H$o$:$K<j$G>C$7$?%U%!%$%k$K$D$$$FF1$8A`:n$GI|85$9$k$3$H(B | |
337 $B$,$G$-$k!%!J(BMercurial$B$NMQ8l$G$3$l$r(Bmissing$B$H8F$s$G$$$?$3$H$r;W$$=P$7$FM_(B | |
338 $B$7$$!%!K(B | |
339 \interaction{daily.revert.missing} | |
298 | 340 |
299 | 341 %If you revert a \hgcmd{copy}, the copied-to file remains in your |
342 %working directory afterwards, untracked. Since a copy doesn't affect | |
343 %the copied-from file in any way, Mercurial doesn't do anything with | |
344 %the copied-from file. | |
345 %\interaction{daily.revert.copy} | |
346 | |
347 \hgcmd{copy}$B%3%^%s%I$r<h$j>C$7$?>l9g!$%3%T!<@h$N%U%!%$%k$O%o!<%-%s%0%G%#(B | |
348 $B%l%/%H%j$K;D$k$,(BMercurial$B$+$i$O4IM}$5$l$J$$!%%3%T!<A`:n<+BN%3%T!<85%U%!%$(B | |
349 $B%k$K1F6A$rM?$($J$$$?$a!$<h$j>C$7$K$h$C$F%3%T!<85%U%!%$%k$,1F6A$r<u$1$k$3(B | |
350 $B$H$b$J$$!%(B | |
298 | 351 |
122
3af28630fe8c
How to goodbye depression by reverting one thousand times daily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
121
diff
changeset
|
352 |
299 | 353 %\section{Dealing with committed changes} |
354 \section{$B%3%_%C%H$5$l$?JQ99$N07$$(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
355 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
356 %Consider a case where you have committed a change \emph{a}, and another |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
357 %change \emph{b} on top of it; you then realise that change \emph{a} was |
299 | 358 %incorrect. Mercurial lets you ``back out'' an entire changeset |
359 %automatically, and building blocks that let you reverse part of a | |
360 %changeset by hand. | |
361 | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
362 \emph{a}$B$r%3%_%C%H$7$?8e$GJL$N(B\emph{b}$B$r%3%_%C%H$7!$$3$3$G(B\emph{a}$B$,8m$j(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
363 $B$G$"$k$3$H$K5$$E$$$?>l9g$r9M$($k!%(BMercurial$B$O%A%'%s%8%;%C%HA4BN$H%A%'%s%8(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
364 $B%;%C%H$N0lItJ,$r<j$G%P%C%/%"%&%H$9$k$h$&$KB%$9!%(B |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
365 |
299 | 366 %Before you read this section, here's something to keep in mind: the |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
367 %\hgcmd{backout} command undoes the effect of a change by \emph{adding} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
368 %to your repository's history, not by modifying or erasing it. It's the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
369 %right tool to use if you're fixing bugs, but not if you're trying to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
370 %undo some change that has catastrophic consequences. To deal with |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
371 %those, see section~\ref{sec:undo:aaaiiieee}. |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
372 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
373 $B$3$N@a$rFI$`A0$K!$(B\hgcmd{backout}$B%3%^%s%I$O%j%]%8%H%jMzNr$r?7$?$K(B\emph{$BDI(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
374 $B2C(B}$B$9$k$3$H$GJQ99$K$h$k1F6A$r<h$j>C$9$3$H$r3P$($F$*$$$FM_$7$$!%MzNr$NJQ99(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
375 $B$d>C5n$G$O$J$$!%(B\hgcmd{backout}$B$O%P%0$N=$@5$N$?$a$KLrN)$D%D!<%k$@$,!$Bg5,(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
376 $BLO$J1F6A$r;}$DJQ99$r<h$j>C$9$?$a$N%D!<%k$G$O$J$$!%8e<T$NL\E*$N$?$a$K$O(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
377 \ref{sec:undo:aaaiiieee}$B$r;2>H$5$l$?$$!%(B |
299 | 378 |
379 %\subsection{Backing out a changeset} | |
380 \subsection{$B%A%'%s%8%;%C%H$N%P%C%/%"%&%H(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
381 |
300 | 382 %The \hgcmd{backout} command lets you ``undo'' the effects of an entire |
383 %changeset in an automated fashion. Because Mercurial's history is | |
384 %immutable, this command \emph{does not} get rid of the changeset you | |
385 %want to undo. Instead, it creates a new changeset that | |
386 %\emph{reverses} the effect of the to-be-undone changeset. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
387 |
300 | 388 \hgcmd{backout}$B%3%^%s%I$O%A%'%s%8%;%C%HA4BN$N:nMQ$rBG$A>C$9!%(BMercurial$B$N(B |
389 $BMzNr$OITJQ$J$N$G!$$3$N%3%^%s%I$O<h$j>C$7$?$$%A%'%s%8%;%C%H$r<h$j=|$/$b$N(B | |
390 $B$G$O(B\emph{$B$J$$(B}$B!%$=$NBe$o$j!$<h$j=|$-$?$$%A%'%s%8%;%C%H$N(B\emph{$B5U(B}$B$NF/$-(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
391 $B$N?7$?$J%A%'%s%8%;%C%H$r@8@.$9$k!%(B |
300 | 392 |
393 %The operation of the \hgcmd{backout} command is a little intricate, so | |
394 %let's illustrate it with some examples. First, we'll create a | |
395 %repository with some simple changes. | |
396 %\interaction{backout.init} | |
397 | |
398 \hgcmd{backout}$B%3%^%s%I$NF0:n$O$d$dJ#;($J$N$G!$Nc$r5s$2$F@bL@$9$k$3$H$K(B | |
399 $B$9$k!%$^$:$$$/$D$+$NC1=c$JJQ99$N$"$k%j%]%8%H%j$r9M$($k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
400 \interaction{backout.init} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
401 |
300 | 402 %The \hgcmd{backout} command takes a single changeset ID as its |
403 %argument; this is the changeset to back out. Normally, | |
404 %\hgcmd{backout} will drop you into a text editor to write a commit | |
405 %message, so you can record why you're backing the change out. In this | |
406 %example, we provide a commit message on the command line using the | |
407 %\hgopt{backout}{-m} option. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
408 |
300 | 409 \hgcmd{backout}$B%3%^%s%I$O%P%C%/%"%&%H$9$Y$-%A%'%s%8%;%C%H$N(BID$B$r0l$D0z?t$K(B |
410 $B<h$k!%(B\hgcmd{backout}$B$O%G%U%)%k%H$G%3%_%C%H%a%C%;!<%8F~NO$N$?$a$K%F%-%9%H(B | |
411 $B%(%G%#%?$r5/F0$9$k$N$G!%%P%C%/%"%&%H$NM}M3$r5-O?$7$F$*$/!%$3$NNc$G$O(B | |
412 \hgopt{backout}{-m}$B%*%W%7%g%s$r;H$C$F%3%_%C%H%a%C%;!<%8$r5-O?$7$F$$$k!%(B | |
413 | |
414 | |
415 %\subsection{Backing out the tip changeset} | |
416 \subsection{tip$B%A%'%s%8%;%C%H$r%P%C%/%"%&%H$9$k(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
417 |
300 | 418 %We're going to start by backing out the last changeset we committed. |
419 %\interaction{backout.simple} | |
420 %You can see that the second line from \filename{myfile} is no longer | |
421 %present. Taking a look at the output of \hgcmd{log} gives us an idea | |
422 %of what the \hgcmd{backout} command has done. | |
423 %\interaction{backout.simple.log} | |
424 %Notice that the new changeset that \hgcmd{backout} has created is a | |
425 %child of the changeset we backed out. It's easier to see this in | |
426 %figure~\ref{fig:undo:backout}, which presents a graphical view of the | |
427 %change history. As you can see, the history is nice and linear. | |
428 | |
429 $B:G8e$K%3%_%C%H$7$?%A%'%s%8%;%C%H$r%P%C%/%"%&%H$9$k$3$H$+$i;O$a$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
430 \interaction{backout.simple} |
300 | 431 \filename{myfile}$B$N(B2$B9TL\$,$J$/$J$C$F$$$k$N$,J,$+$k$H;W$&!%(B\hgcmd{log}$B$r(B |
432 $B8+$F$_$k$H!$(B\hgcmd{backout}$B$,2?$r$7$?$N$+$,J,$+$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
433 \interaction{backout.simple.log} |
300 | 434 \hgcmd{backout}$B$,@8@.$7$??7$7$$%A%'%s%8%;%C%H$O!$%P%C%/%"%&%H$7$?%A%'%s(B |
435 $B%8%;%C%H$N;R$K$J$C$F$$$k!%(B\ref{fig:undo:backout}$B$O99?7MzNr$r?^<($7$?$b$N(B | |
436 $B$G!$M}2r$N=u$1$K$J$k$O$:$@!%?^$+$iJ,$+$k$h$&$KMzNr$O@~7A$G@09g$,<h$l$F$$$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
437 |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
438 \begin{figure}[htb] |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
439 \centering |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
440 \grafix{undo-simple} |
300 | 441 % \caption{Backing out a change using the \hgcmd{backout} command} |
442 \caption{\hgcmd{backout}$B%3%^%s%I$r;H$C$F99?7$r%P%C%/%"%&%H(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
443 \label{fig:undo:backout} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
444 \end{figure} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
445 |
300 | 446 %\subsection{Backing out a non-tip change} |
447 \subsection{tip$B$G$J$$JQ99$r%P%C%/%"%&%H$9$k(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
448 |
300 | 449 %If you want to back out a change other than the last one you |
450 %committed, pass the \hgopt{backout}{--merge} option to the | |
451 %\hgcmd{backout} command. | |
452 %\interaction{backout.non-tip.clone} | |
453 %This makes backing out any changeset a ``one-shot'' operation that's | |
454 %usually simple and fast. | |
455 %\interaction{backout.non-tip.backout} | |
456 | |
457 $B:G8e$N%3%_%C%H0J30$NJQ99$r%P%C%/%"%&%H$7$?$$;~$O!$(B | |
458 \hgcmd{backout}$B$K(B\hgopt{backout}{--merge}$B%*%W%7%g%s$rIU$1$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
459 \interaction{backout.non-tip.clone} |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
460 $B$3$N%*%W%7%g%s$O$I$s$J%A%'%s%8%;%C%H$G$b0l2s$NF0:n$G9T$&$3$H$,$G$-!$<j(B |
300 | 461 $BAa$/4JC1$G$"$k!%(B |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
462 \interaction{backout.non-tip.backout} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
463 |
300 | 464 %If you take a look at the contents of \filename{myfile} after the |
465 %backout finishes, you'll see that the first and third changes are | |
466 %present, but not the second. | |
467 %\interaction{backout.non-tip.cat} | |
468 | |
469 $B%P%C%/%"%&%H$,=*$C$?$"$H$G(B\filename{myfile}$B$NCf?H$r8+$k$H!$(B1$BHVL\$H(B3$BHVL\(B | |
470 $B$NJQ99$@$1$,;D$C$F$*$j!$(B2$BHVL\$NJQ99$,>C$($F$$$k$3$H$,$o$+$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
471 \interaction{backout.non-tip.cat} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
472 |
300 | 473 %As the graphical history in figure~\ref{fig:undo:backout-non-tip} |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
474 %illustrates, Mercurial still commits one change in this kind of |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
475 %situation (the box-shaped node is the ones that Mercurial commits |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
476 %automatically), but the revision graph now looks different. Before |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
477 %Mercurial begins the backout process, it first remembers what the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
478 %current parent of the working directory is. It then backs out the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
479 %target changeset, and commits that as a changeset. Finally, it merges |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
480 %back to the previous parent of the working directory, but notice that it |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
481 %\emph{does not commit} the result of the merge. The repository now |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
482 %contains two heads, and the working directory is in a merge state. |
300 | 483 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
484 $B?^(B\ref{fig:undo:backout-non-tip}$B$NMzNr%0%i%U$G!$(BMercurial$B$O(B1$B$D$NJQ99$r%3(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
485 $B%_%C%H$7$F$$$k!J?^Cf$GH"$G<($5$l$?@aE@$O(BMercurial$B$,<+F0E*$K9T$C$?%3%_%C%H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
486 $B$G$"$k!%!K$,!$%j%S%8%g%s%0%i%U$K$OJQ2=$,5/$-$F$$$k!%%P%C%/%"%&%H%W%m%;%9(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
487 $B$NA0$K(BMercurial$B$O!$8=:_$N%o!<%-%s%0%G%#%l%/%H%j$N?F$,2?$G$"$k$+$r5-21$9(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
488 $B$k!%$=$7$F%?!<%2%C%H$N%A%'%s%8%;%C%H$r<h$j=|$-!$$3$l$r%A%'%s%8%;%C%H$H$7(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
489 $B$F%3%_%C%H$9$k!%:G8e$K(BMercurial$B$O%o!<%-%s%0%G%#%l%/%H%j$N0JA0$NN>?F$K%^!<(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
490 $B%8$r9T$&$,!$%^!<%8$N7k2L$r(B\emph{$B%3%_%C%H$7$J$$(B}$B$3$H$KN10U$5$l$?$$!%$3$N;~(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
491 $BE@$G%j%]%8%H%j$O(B2$B$D$N%X%C%I$r;}$A!$%o!<%-%s%0%G%#%l%/%H%j$O%^!<%8:Q$_$N>u(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
492 $BBV$K$J$k!%(B |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
493 |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
494 \begin{figure}[htb] |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
495 \centering |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
496 \grafix{undo-non-tip} |
300 | 497 % \caption{Automated backout of a non-tip change using the |
498 % \hgcmd{backout} command} | |
499 \caption{tip$B$G$J$$JQ99$r(B\hgcmd{backout}$B%3%^%s%I$G<+F0E*$K%P%C%/%"%&%H$9$k(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
500 \label{fig:undo:backout-non-tip} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
501 \end{figure} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
502 |
300 | 503 %The result is that you end up ``back where you were'', only with some |
504 %extra history that undoes the effect of the changeset you wanted to | |
505 %back out. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
506 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
507 $B:G=*E*$K!$<h$j=|$-$?$+$C$?%A%'%s%8%;%C%H$N1F6A$r=|5n$7!$MzNr$K=|5n$N5-O?(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
508 $B$3$=A}$($F$$$k$b$N$N!$K>$`>uBV$KLa$9$3$H$,$G$-$F$$$k!%(B |
300 | 509 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
510 %You might wonder why Mercurial does not commit the result of the merge |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
511 %that it performed. The reason lies in Mercurial behaving |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
512 %conservatively: a merge naturally has more scope for error than simply |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
513 %undoing the effect of the tip changeset, so your work will be safest if |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
514 %you first inspect (and test!) the result of the merge, \emph{then} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
515 %commit it. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
516 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
517 $B$J$<(BMercurial$B$,%^!<%8$N:]$K%3%_%C%H$b9T$o$J$$$N$+5?Ld$K46$8$k$+$b$7$l$J(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
518 $B$$!%(BMercurial$B$,$3$N$h$&$JF0:n$r$9$kM}M3$O!$%^!<%8$OC1$K(Btip$B%A%'%s%8%;%C%H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
519 $B$N8z2L$r<h$j=|$/>l9g$h$j$b%(%i!<$N860x$K$J$kMWAG$,B?$/!$$=$N$?$a!$$^$:%^!<(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
520 $B%8$N7k2L$r8!::$7!$>l9g$K$h$C$F$O%F%9%H$b9T$C$F!$$=$N>e$G%3%_%C%H$9$Y$-$G(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
521 $B$"$k$H$$$&9M$($G@_7W$5$l$F$$$k$?$a$G$"$k!%(B |
300 | 522 |
523 %\subsubsection{Always use the \hgopt{backout}{--merge} option} | |
524 \subsubsection{$B>o$K(B\hgopt{backout}{--merge}$B%*%W%7%g%s$r;H$&(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
525 |
300 | 526 %In fact, since the \hgopt{backout}{--merge} option will do the ``right |
527 %thing'' whether or not the changeset you're backing out is the tip | |
528 %(i.e.~it won't try to merge if it's backing out the tip, since there's | |
529 %no need), you should \emph{always} use this option when you run the | |
530 %\hgcmd{backout} command. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
531 |
300 | 532 $B%P%C%/%"%&%H$7$h$&$H$9$k%A%'%s%8%;%C%H$,%A%C%W$+%A%C%W$G$J$$$+$K$+JQ$o$i(B |
533 $B$:!$(B\hgcmd{backout}$B%3%^%s%I$r;H$*$&$H$9$k;~$O(B\emph{$B>o$K(B} | |
534 \hgopt{backout}{--merge}$B%*%W%7%g%s$r;H$&$Y$-$G$"$k!%BP>]$,%A%C%W$G$"$k>l(B | |
535 $B9g$OITMW$J%^!<%8$r;n$_$k$3$H$O$J$$$?$a!$>o$K$3$N%*%W%7%g%s$r;XDj$7$FLdBj(B | |
536 $B$J$$!%(B | |
537 | |
538 | |
539 %\subsection{Gaining more control of the backout process} | |
540 \subsection{$B%P%C%/%"%&%H%W%m%;%9$r$h$j:Y$+$/@)8f$9$k(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
541 |
303 | 542 %While I've recommended that you always use the |
543 %\hgopt{backout}{--merge} option when backing out a change, the | |
544 %\hgcmd{backout} command lets you decide how to merge a backout | |
545 %changeset. Taking control of the backout process by hand is something | |
546 %you will rarely need to do, but it can be useful to understand what | |
547 %the \hgcmd{backout} command is doing for you automatically. To | |
548 %illustrate this, let's clone our first repository, but omit the | |
549 %backout change that it contains. | |
550 | |
551 $BJQ99$r%P%C%/%"%&%H$9$k:]!$>o$K(B\hgopt{backout}{--merge}$B%*%W%7%g%s$r;H$&$3(B | |
552 $B$H$r4+$a$?$,!$(B\hgcmd{backout}$B%3%^%s%I$G$O!$%P%C%/%"%&%H$9$k%A%'%s%8%;%C%H(B | |
553 $B$r$I$N$h$&$K%^!<%8$9$k$+;XDj$9$k$3$H$,$G$-$k!%%P%C%/%"%&%H%W%m%;%9$r<j$G(B | |
554 $B%3%s%H%m!<%k$9$kI,MW$O$[$H$s$I$J$$$O$:$@$,!$(B\hgcmd{backout}$B%3%^%s%I$,<+F0(B | |
555 $B$G$I$N$h$&$KF0:n$7$F$$$k$N$+M}2r$9$k$N$K$OLrN)$D$+$bCN$l$J$$!%F0:n$r@bL@(B | |
556 $B$9$k$?$a$K:G=i$N%j%]%8%H%j$N%/%m!<%s$r!$%P%C%/%"%&%H$r=|$$$F:n$C$F;O$a$k(B | |
557 $B$3$H$K$7$h$&!%(B | |
558 | |
559 %\interaction{backout.manual.clone} | |
560 %As with our earlier example, We'll commit a third changeset, then back | |
561 %out its parent, and see what happens. | |
562 %\interaction{backout.manual.backout} | |
563 %Our new changeset is again a descendant of the changeset we backout | |
564 %out; it's thus a new head, \emph{not} a descendant of the changeset | |
565 %that was the tip. The \hgcmd{backout} command was quite explicit in | |
566 %telling us this. | |
567 %\interaction{backout.manual.log} | |
568 % | |
569 %\interaction{backout.manual.clone} | |
570 | |
571 $BA0$K;H$C$?Nc$N$h$&$K!$(B3$BHVL\$N%A%'%s%8%;%C%H$r%3%_%C%H$7$?8e$G!$$=$N?F$r(B | |
572 $B%P%C%/%"%&%H$7$F2?$,5/$-$k$+8+$F$_$h$&!%(B | |
573 \interaction{backout.manual.backout} | |
574 | |
575 $BA0$NNc$HF1MM$K!$?7$7$$%A%'%s%8%;%C%H$O%P%C%/%"%&%H$7$?%A%'%s%8%;%C%H$N;R(B | |
576 $B$K$"$?$k!%$7$?$,$C$F?7$7$$%X%C%I$O%A%C%W$N;R$G$O(B\emph{$B$J$$(B}$B!%(B | |
577 \hgcmd{backout}$B%3%^%s%I$O$3$N?F;R4X78$K$D$$$F$+$J$j$O$C$-$j$HI=<($9$k!%(B | |
578 \interaction{backout.manual.log} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
579 |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
580 \interaction{backout.manual.clone} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
581 |
303 | 582 %Again, it's easier to see what has happened by looking at a graph of |
583 %the revision history, in figure~\ref{fig:undo:backout-manual}.This | |
584 %makes it clear that when we use \hgcmd{backout} to back out a change | |
585 %other than the tip, Mercurial adds a new head to the repository (the | |
586 %change it committed is box-shaped). | |
587 | |
588 $B$3$3$G$b%j%S%8%g%sMzNr$N%0%i%U(B\ref{fig:undo:backout-manual}$B$r8+$l$P!$2?$,(B | |
589 $B5/$-$F$$$k$N$+M}2r$7$d$9$$!%%A%C%W0J30$NJQ99$r%P%C%/%"%&%H$9$k$?$a$K(B | |
590 \hgcmd{backout}$B$r;H$C$?;~!$(BMercurial$B$,?7$7$$%X%C%I$r%j%]%8%H%j$KDI2C$9$k(B | |
591 $B$N$,$o$+$k!%!J;M3Q$G<($5$l$?%3%_%C%H!%!K(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
592 |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
593 \begin{figure}[htb] |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
594 \centering |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
595 \grafix{undo-manual} |
303 | 596 % \caption{Backing out a change using the \hgcmd{backout} command} |
597 \caption{\hgcmd{backout}$B%3%^%s%I$K$h$kJQ99$N%P%C%/%"%&%H(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
598 \label{fig:undo:backout-manual} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
599 \end{figure} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
600 |
306 | 601 %After the \hgcmd{backout} command has completed, it leaves the new |
602 %``backout'' changeset as the parent of the working directory. | |
603 %\interaction{backout.manual.parents} | |
604 %Now we have two isolated sets of changes. | |
605 %\interaction{backout.manual.heads} | |
606 | |
607 \hgcmd{backout}$B%3%^%s%I$O!$40N;$7$?8e!$%P%C%/%"%&%H%A%'%s%8%;%C%H$r%o!<%-(B | |
608 $B%s%0%G%#%l%/%H%j$N?F$H$7$F;D$9!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
609 \interaction{backout.manual.parents} |
306 | 610 $B$3$3$G(B2$B$D$N3VN%$5$l$?JQ99$N%;%C%H$,B8:_$9$k$3$H$K$J$k!%(B |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
611 \interaction{backout.manual.heads} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
612 |
306 | 613 |
614 %Let's think about what we expect to see as the contents of | |
615 %\filename{myfile} now. The first change should be present, because | |
616 %we've never backed it out. The second change should be missing, as | |
617 %that's the change we backed out. Since the history graph shows the | |
618 %third change as a separate head, we \emph{don't} expect to see the | |
619 %third change present in \filename{myfile}. | |
620 %\interaction{backout.manual.cat} | |
621 %To get the third change back into the file, we just do a normal merge | |
622 %of our two heads. | |
623 %\interaction{backout.manual.merge} | |
624 %Afterwards, the graphical history of our repository looks like | |
625 %figure~\ref{fig:undo:backout-manual-merge}. | |
626 | |
627 $B:#$3$3$G(B\filename{myfile}$B$NFbMF$r8+$?$$$H$9$k!%:G=i$NJQ99$O%P%C%/%"%&%H$7(B | |
628 $B$F$$$J$$$N$GB8:_$7$F$$$k$O$:$G$"$k!%(B2$BHVL\$NJQ99$O%P%C%/%"%&%H$7$?$N$G>C(B | |
629 $B$($FL5$/$J$C$F$$$k$O$:$@!%(B3$BHVL\$NJQ99$OMzNr%0%i%U$GJ,N%$7$?%X%C%I$H$7$F(B | |
630 $BI=<($5$l$k$?$a!$(B3$BHVL\$NJQ99$,(B\filename{myfile}$B$K$"$k$H$O4|BT$7$F$$$J$$!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
631 \interaction{backout.manual.cat} |
306 | 632 3$BHVL\$NJQ99$r%U%!%$%k$KH?1G$5$;$k$?$a$K$O!$(B2$B$D$N%X%C%I$r%^!<%8$7$F$d$l$P(B |
633 $B$h$$!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
634 \interaction{backout.manual.merge} |
306 | 635 $B$=$N8e$G$O%j%]%8%H%j$NMzNr$N%0%i%U$O?^(B |
636 \ref{fig:undo:backout-manual-merge}$B$N$h$&$K$J$k(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
637 |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
638 \begin{figure}[htb] |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
639 \centering |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
640 \grafix{undo-manual-merge} |
306 | 641 % \caption{Manually merging a backout change} |
642 \caption{$B%P%C%/%"%&%H%A%'%s%8$N<jF0$K$h$k%^!<%8(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
643 \label{fig:undo:backout-manual-merge} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
644 \end{figure} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
645 |
306 | 646 %\subsection{Why \hgcmd{backout} works as it does} |
647 \subsection{$B$J$<(B\hgcmd{backout}$B$O$3$N$h$&$KF0:n$9$k$N$+(B} | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
648 |
306 | 649 %Here's a brief description of how the \hgcmd{backout} command works. |
650 %\begin{enumerate} | |
651 %\item It ensures that the working directory is ``clean'', i.e.~that | |
652 % the output of \hgcmd{status} would be empty. | |
653 %\item It remembers the current parent of the working directory. Let's | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
654 % call this changeset \texttt{orig}. |
306 | 655 %\item It does the equivalent of a \hgcmd{update} to sync the working |
656 % directory to the changeset you want to back out. Let's call this | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
657 % changeset \texttt{backout}. |
306 | 658 %\item It finds the parent of that changeset. Let's call that |
659 % changeset \texttt{parent}. | |
660 %\item For each file that the \texttt{backout} changeset affected, it | |
661 % does the equivalent of a \hgcmdargs{revert}{-r parent} on that file, | |
662 % to restore it to the contents it had before that changeset was | |
663 % committed. | |
664 %\item It commits the result as a new changeset. This changeset has | |
665 % \texttt{backout} as its parent. | |
666 %\item If you specify \hgopt{backout}{--merge} on the command line, it | |
667 % merges with \texttt{orig}, and commits the result of the merge. | |
668 %\end{enumerate} | |
669 | |
670 \hgcmd{backout}$B$,$I$N$h$&$KF0:n$9$k$+407k$K@bL@$9$k$H0J2<$N$h$&$K$J$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
671 \begin{enumerate} |
306 | 672 \item $B%o!<%-%s%0%G%#%l%/%H%j$,%/%j!<%s$G$"$k$3$H$r3NG'$9$k!%(Bi.e.\hgcmd{status} |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
673 $B$,6u$G$"$k$3$H$r3NG'$9$k!%(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
674 \item $B8=:_$N%o!<%-%s%0%G%#%l%/%H%j$N?F$r5-21$9$k!%$3$N%A%'%s%8%;%C%H$r(B |
306 | 675 \texttt{orig}$B$H8F$V$3$H$K$9$k!%(B |
676 \item $B%o!<%-%s%0%G%#%l%/%H%j$r!$%P%C%/%"%&%H$7$?%A%'%s%8%;%C%H$NFbMF$K(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
677 $B$9$k$?$a$K(B\hgcmd{update}$B$HEy2A$JF0:n$r9T$&!%$3$N%A%'%s%8%;%C%H(B |
306 | 678 $B$r(B\texttt{backout}$B$H8F$V!%(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
679 \item $B$=$N%A%'%s%8%;%C%H$N?F$r8+$D$1=P$9!%$3$N%A%'%s%8%;%C%H$r(B |
306 | 680 \texttt{parent}$B$H8F$V$3$H$K$9$k!%(B |
681 \item \texttt{backout}$B%A%'%s%8%;%C%H$,1F6A$9$k3F!9$N%U%!%$%k$KBP$7$F!$(B | |
682 \hgcmdargs{revert}{-r parent}$B$HEy2A$JA`:n$r9T$$!$%A%'%s%8%;%C%H$,(B | |
683 $B%3%_%C%H$5$l$kA0$N>uBV$KLa$9!%(B | |
684 \item $B?7$7$$%A%'%s%8%;%C%H$N7k2L$r%3%_%C%H$9$k!%$3$N%A%'%s%8%;%C%H$O(B | |
685 \texttt{backout}$B$r?F$K;}$D!%(B | |
686 \item \hgopt{backout}{--merge}$B$r%3%^%s%I%i%$%s$+$iF~NO$7$?>l9g!$(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
687 \texttt{orig}$B$H$N%^!<%8$r9T$$!$7k2L$r%3%_%C%H$9$k!%(B |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
688 \end{enumerate} |
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
689 |
306 | 690 %An alternative way to implement the \hgcmd{backout} command would be |
691 %to \hgcmd{export} the to-be-backed-out changeset as a diff, then use | |
692 %the \cmdopt{patch}{--reverse} option to the \command{patch} command to | |
693 %reverse the effect of the change without fiddling with the working | |
694 %directory. This sounds much simpler, but it would not work nearly as | |
695 %well. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
696 |
306 | 697 \hgcmd{backout}$B%3%^%s%I$r<BAu$9$kJL$NJ}K!$H$7$F!$(B\hgcmd{export}$B$G%P%C%/%"(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
698 $B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r:9J,$H$7$F=PNO$7!$(B |
348
32d33b238b7e
made changes to the source files to be compiled at any rate.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
314
diff
changeset
|
699 \command{patch}$B$r(B\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B |
306 | 700 $B%0%G%#%l%/%H%j$NA`:n$r>JN,$7$F%j%P!<%9%Q%C%A$9$kJ}K!$,9M$($i$l$k!%(B |
701 $B$3$NJ}K!$O$:$C$HC1=c$@$,!$$[$H$s$I$&$^$/F0$+$J$$!%(B | |
702 | |
703 %The reason that \hgcmd{backout} does an update, a commit, a merge, and | |
704 %another commit is to give the merge machinery the best chance to do a | |
705 %good job when dealing with all the changes \emph{between} the change | |
706 %you're backing out and the current tip. | |
707 | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
708 \hgcmd{backout}$B$,%"%C%W%G!<%H!$%3%_%C%H!$%^!<%8!$%3%_%C%H$r9T$&M}M3$O!$(B |
306 | 709 $B%P%C%/%"%&%H$9$Y$-JQ99$H8=:_$N%A%C%W$N4V$G!$%^!<%85!9=$,:G$bNI$$7k2L$rF@(B |
710 $B$i$l$k$h$&$K$9$k$?$a$G$"$k!%(B | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
711 |
306 | 712 %If you're backing out a changeset that's~100 revisions back in your |
713 %project's history, the chances that the \command{patch} command will | |
714 %be able to apply a reverse diff cleanly are not good,because | |
715 %intervening changes are likely to have ``broken the context'' that | |
716 %\command{patch} uses to determine whether it can apply a patch (if | |
717 %this sounds like gibberish, see \ref{sec:mq:patch} for a | |
718 %discussion of the \command{patch} command). | |
719 %Also, Mercurial's merge machinery will handle files and directories | |
720 %being renamed, permission changes, and modifications to binary files, | |
721 %none of which \command{patch} can deal with. | |
124
c9aad709bd3a
Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
123
diff
changeset
|
722 |
306 | 723 $B$b$7%W%m%8%'%/%H$NMzNr$NCf$G(B100$B%j%S%8%g%s$bAL$k$h$&$J%A%'%s%8%;%C%H$r%P%C(B |
724 $B%/%"%&%H$9$k$H$9$l$P!$(B\command{patch}$B$,(Bdiff$B$rE,MQ$G$-$k2DG=@-$OL@$i$+$KDc(B | |
725 $B$$!%4V$K$"$kJQ99$,!$(B\command{patch}$B%3%^%s%I$,%Q%C%AE,MQ$N2DH]$rH=CG$9$k$?(B | |
726 $B$a$NJ8L.$r2u$7$F$$$k2DG=@-$,9b$$$+$i$G$"$k!%!J$3$NOC$,J,$+$i$J$$>l9g$O(B | |
727 \ref{sec:mq:patch}$B$N(B\command{patch}$B%3%^%s%I$K4X$9$k5DO@$r;2>H$7$FM_$7$$!%!K(B | |
728 $B$^$?!$(BMercurial$B$N%^!<%85!9=$O!$(B\command{patch}$B%3%^%s%I$,07$($J$$%U%!%$%k(B | |
729 $B$H%G%#%l%/%H%j$N%j%M!<%`!$%Q!<%_%C%7%g%sJQ99!$%P%$%J%j%U%!%$%k$X$NJQ99$J(B | |
730 $B$I$r07$&$3$H$,$G$-$k!%(B | |
731 | |
732 | |
733 %\section{Changes that should never have been} | |
307 | 734 \section{$BB8:_$9$Y$-$G$J$$JQ99(B} |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
735 \label{sec:undo:aaaiiieee} |
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
736 |
307 | 737 %Most of the time, the \hgcmd{backout} command is exactly what you need |
738 %if you want to undo the effects of a change. It leaves a permanent | |
739 %record of exactly what you did, both when committing the original | |
740 %changeset and when you cleaned up after it. | |
741 | |
742 $BBgDq$N>l9g!$(B\hgcmd{backout}$B$O$"$kJQ99$r<h$j>C$=$&$H$9$k:]$K;W$C$?$h$&$K5!(B | |
743 $BG=$9$k$O$:$G$"$k!%85!9$N%3%_%C%H$d$=$l$r<h$j=|$$$?;~$K2?$r$7$?$N$+1JB3E*(B | |
744 $B$J5-21$,;D$5$l$k!%(B | |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
745 |
307 | 746 %On rare occasions, though, you may find that you've committed a change |
747 %that really should not be present in the repository at all. For | |
748 %example, it would be very unusual, and usually considered a mistake, | |
749 %to commit a software project's object files as well as its source | |
750 %files.Object files have almost no intrinsic value, and they're | |
751 %\emph{big}, so they increase the size of the repository and the amount | |
752 %of time it takes to clone or pull changes. | |
753 | |
754 $B$=$l$G$b$?$^$K%j%]%8%H%j$KA4$/;D$7$?$/$J$$JQ99$r%3%_%C%H$7$F$7$^$&$3$H$,(B | |
755 $B$"$k!%$?$H$($P!$Hs>o$KJQ$J%3%_%C%H$d!$DL>o%_%9$H9M$($i$l$k$h$&$J%3%_%C%H!$(B | |
756 $B%=!<%9$@$1$G$O$J$/%W%m%8%'%/%H$N%*%V%8%'%/%H%U%!%$%k$b%3%_%C%H$7$F$7$^$&(B | |
757 $B$J$I$,M-$jF@$k!%%*%V%8%'%/%H%U%!%$%k$O8GM-$NCM$r;}$AF@$:!$$+$D(B\emph{$BBg$-(B | |
758 $B$$(B}$B!%$=$N$?$a!$%j%]%8%H%j$N%5%$%:$rA}$d$7!$%/%m!<%s$d%W%k$KM>7W$J;~4V$,3](B | |
759 $B$+$k$h$&$K$J$k!%(B | |
760 | |
761 %Before I discuss the options that you have if you commit a ``brown | |
762 %paper bag'' change (the kind that's so bad that you want to pull a | |
763 %brown paper bag over your head), let me first discuss some approaches | |
764 %that probably won't work. | |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
765 |
307 | 766 $BCc?'$N;fB^%3%_%C%H!JCc?'$N;fB^$rF,$KHo$j$?$$$0$i$$%P%D$N0-$$%3%_%C%H!K$K(B |
767 $B;H$($k%*%W%7%g%s$K$D$$$F5DO@$9$kA0$K!$$$$/$D$+$N$&$^$/9T$+$J$$%"%W%m!<%A(B | |
768 $B$r=R$Y$?$$!%(B | |
769 | |
770 %Since Mercurial treats history as accumulative---every change builds | |
771 %on top of all changes that preceded it---you generally can't just make | |
772 %disastrous changes disappear. The one exception is when you've just | |
773 %committed a change, and it hasn't been pushed or pulled into another | |
774 %repository. That's when you can safely use the \hgcmd{rollback} | |
775 %command, as I detailed in section~\ref{sec:undo:rollback}. | |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
776 |
307 | 777 Mercurial$B$OMzNr$rN_@QE*$J$b$N$H$7$F07$&!%A4$F$NJQ99$O$=$l$K@hN)$DA4$F$NJQ(B |
778 $B99$N>e$K$J$j$?$C$F$$$k!%0lHLE*$K8@$C$FGK2uE*$JJQ99$r2sHr$9$k$3$H$O$G$-$J(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
779 $B$$!%$?$C$?0l$D$NNc30$O%3%_%C%H$r9T$C$?D>8e$G!$B>$N%j%]%8%H%j$K%W%C%7%e(B |
307 | 780 $B$b%W%k$b$5$l$F$$$J$$>l9g$G$"$k!%$=$N>l9g!$(B\ref{sec:undo:rollback}$B$N%;%/%7%g(B |
781 $B%s$G>\$7$/?($l$?$h$&$K!$0BA4$K(B\hgcmd{rollback}$B$r<B9T$9$k$3$H$,$G$-$k!%(B | |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
782 |
307 | 783 %After you've pushed a bad change to another repository, you \emph{could} |
784 %still use \hgcmd{rollback} to make your local copy of the change | |
785 %disappear, but it won't have the consequences you want. The change will | |
786 %still be present in the remote repository, so it will reappear in your | |
787 %local repository the next time you pull. | |
788 | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
789 $B4V0c$C$?JQ99$rB>$N%j%]%8%H%j$K%W%C%7%e$7$?8e$G$b%m!<%+%k%3%T!<$NJQ99$r<h(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
790 $B$j>C$9$?$a$K0MA3$H$7$F(B\hgcmd{rollback}$B$r;H$&$3$H$,(B\emph{$B$G$-$k(B}$B$,!$$3$l$O(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
791 $B0U?^$7$?$h$&$J7k2L$K$O$J$i$J$$!%JQ99$O0MA3$H$7$F%j%b!<%H$N%j%]%8%H%j$K$O(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
792 $BB8:_$7$F$*$j!$<!$K%W%k$7$?;~$K$O%m!<%+%k%j%]%8%H%j$K$b8=$l$k!%(B |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
793 |
307 | 794 %If a situation like this arises, and you know which repositories your |
795 %bad change has propagated into, you can \emph{try} to get rid of the | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
796 %change from \emph{every} one of those repositories. This is, of |
307 | 797 %course, not a satisfactory solution: if you miss even a single |
798 %repository while you're expunging, the change is still ``in the | |
799 %wild'', and could propagate further. | |
800 | |
801 $B$3$N$h$&$J>u67$K$J$C$?;~!$$b$7$I$N%j%]%8%H%j$K$3$N4V0c$C$?JQ99$,GH5Z$7$F(B | |
802 $B$$$k$N$+$,L@$i$+$G$"$l$P!$$=$l$i$N%j%]%8%H%j$N0l$D0l$D$+$i!$JQ99$r<h$j=|(B | |
803 $B$/$3$H$r;n$_$k$3$H$,$G$-$k!%$3$l$O$b$A$m$sK~B-$N$$$/2r7hK!$G$O$J$$!%$b$7(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
804 $B0l$D$G$b>C5n$rK:$l$l$P!$JQ99$OLnJ|$7$K$J$C$F$*$j!$$5$i$K9-$,$j$&$k!%(B |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
805 |
307 | 806 %If you've committed one or more changes \emph{after} the change that |
807 %you'd like to see disappear, your options are further reduced. | |
808 %Mercurial doesn't provide a way to ``punch a hole'' in history, | |
809 %leaving changesets intact. | |
810 | |
811 $B$b$7(B1$B$D0J>e$N?7$?$JJQ99$r!$>C$7$?$$$H;W$C$F$$$kJQ99$N8e$K%3%_%C%H$7$F$$(B | |
812 $B$?$H$9$l$P!$;H$($k%*%W%7%g%s$O$5$i$K>/$J$/$J$k!%(BMercurial$B$O%A%'%s%8%;%C(B | |
813 $B%H$r$=$N$^$^$KMzNr$K7j$r3+$1$k$h$&$JJ}K!$rDs6!$7$F$$$J$$!%(B | |
126
fa3c43dd3a1e
More undo-related verbiage.
Bryan O'Sullivan <bos@serpentine.com>
parents:
125
diff
changeset
|
814 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
815 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
816 %\subsection{Backing out a merge} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
817 \subsection{$B%^!<%87k2L$N%P%C%/%"%&%H(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
818 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
819 %Since merges are often complicated, it is not unheard of for a merge to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
820 %be mangled badly, but committed erroneously. Mercurial provides an |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
821 %important safeguard against bad merges by refusing to commit unresolved |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
822 %files, but human ingenuity guarantees that it is still possible to mess |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
823 %a merge up and commit it. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
824 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
825 $B%^!<%8$OJ#;($J$3$H$bB?$/!$$R$I$/:xAn$7$?$j!$8m$C$F%3%_%C%H$5$l$k>l9g$b$"(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
826 $B$k!%(B Mercurial$B$K$O!$L$%j%>%k%V$N%U%!%$%k$N%3%_%C%H$r5qH]$9$k$3$H$G8m$C$?(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
827 $B%^!<%8$+$i%j%]%8%H%j$r<i$k<jN)$F$,$"$k!%$7$+$7$=$l$G$b%^!<%8>uBV$r:.Mp$5(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
828 $B$;!$$=$l$r%3%_%C%H$9$k$3$H$,2DG=$G$"$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
829 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
830 %Given a bad merge that has been committed, usually the best way to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
831 %approach it is to simply try to repair the damage by hand. A complete |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
832 %disaster that cannot be easily fixed up by hand ought to be very rare, |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
833 %but the \hgcmd{backout} command may help in making the cleanup |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
834 %easier. It offers a \hgopt{backout}{--parent} option, which lets you |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
835 %specify which parent to revert to when backing out a merge. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
836 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
837 $B4V0c$C$?%^!<%8$,%3%_%C%H$5$l$?>l9g!$DL>o$O<jF0$G=$I|$r9T$&$N$,:G$bNI$$%"(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
838 $B%W%m!<%A$G$"$k!%<jF0$G=$I|$G$-$J$$$h$&$JBg;4;v$OLGB?$K$J$$(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
839 $B$,!$(B\hgcmd{backout}$B%3%^%s%I$,=$I|$N=u$1$K$J$k$+$b$7$l$J(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
840 $B$$!%(B\hgopt{backout}{--parent}$B%*%W%7%g%s$r;H$&$H!$$I$N?F$+$i%^!<%8$N%P%C%/(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
841 $B%"%&%H$r9T$&$+$r;XDj$G$-$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
842 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
843 \begin{figure}[htb] |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
844 \centering |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
845 \grafix{figs/bad-merge-1} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
846 %<imageobject><imagedata fileref="figs/bad-merge-1.png"/></imageobject> |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
847 % \caption{A bad merge} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
848 \caption{$B4V0c$C$?%^!<%8(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
849 \label{fig:undo:bad-merge-1} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
850 \end{figure} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
851 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
852 %Suppose we have a revision graph like that in |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
853 %\ref{fig:undo:bad-merge-1}. What we'd like is to \emph{redo} the merge |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
854 %of revisions 2 and 3. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
855 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
856 $B?^(B\ref{fig:undo:bad-merge-1}$B$N$h$&$J%j%S%8%g%s%0%i%U$K$J$C$F$$$k$H$9$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
857 $B$3$3$G%j%S%8%g%s(B2$B$H(B3$B$N%^!<%8$r:F$S9T$$$?$$!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
858 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
859 %One way to do so would be as follows. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
860 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
861 $B$=$NJ}K!$N0l$D$O0J2<$N$h$&$K$J$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
862 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
863 \begin{enumerate} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
864 % \item Call \hgopt{backout}{--rev=4 --parent=2}. This tells |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
865 % \hgcmd{backout} to back out revision 4, which is the bad merge, |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
866 % and to when deciding which revision to prefer, to choose parent |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
867 % 2, one of the parents of the merge. The effect can be seen in |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
868 % \ref{fig:undo:bad-merge-2}. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
869 \item \hgopt{backout}{--rev=4 --parent=2}$B$r<B9T$9$k!%(B\hgcmd{backout}$B$O(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
870 $BLdBj$N$"$k%^!<%8$G$"$k%j%S%8%g%s(B4$B$r%P%C%/%"%&%H$7!$La$9$Y$-%j%S%8%g(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
871 $B%s$r7h$a$k:]$K!$N>J}$N?F$N$&$A!$%j%S%8%g%s(B2$B$rA*$V!%7k2L$r?^(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
872 \ref{fig:undo:bad-merge-2}$B$K<($9!%(B |
129 | 873 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
874 \begin{figure}[htb] |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
875 \centering |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
876 \grafix{figs/bad-merge-2} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
877 %<imageobject><imagedata fileref="figs/bad-merge-2.png"/></imageobject> |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
878 % \caption{Backing out the merge, favoring one parent} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
879 \caption{$B%^!<%8$r%P%C%/%"%&%H$7!$?F$N0lJ}$rA*$V(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
880 \label{fig:undo:bad-merge-2} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
881 \end{figure} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
882 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
883 % \item Call \hgopt{backout}{--rev=4 --parent=3}. This tells |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
884 % \hgcmd{backout} to back out revision 4 again, but this time to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
885 % choose parent 3, the other parent of the merge. The result is |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
886 % visible in \ref{fig:undo:bad-merge-3}, in which the repository |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
887 % now contains three heads. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
888 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
889 \item \hgopt{backout}{--rev=4 --parent=3}$B$r<B9T$9$k!%(B\hgcmd{backout}$B$O$d(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
890 $B$O$j%j%S%8%g%s(B4$B$r%P%C%/%"%&%H$9$k$,!$:#2s$O%^!<%8$N?F$N$&$A%j%S%8%g(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
891 $B%s(B3$B$rA*$V!%7k2L$O?^(B\ref{fig:undo:bad-merge-3}$B$N$h$&$K$J$j!$%j%]%8(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
892 $B%H%j$K$O%X%C%I$,(B3$B$D$G$-$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
893 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
894 \begin{figure}[htb] |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
895 \centering |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
896 \grafix{figs/bad-merge-3} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
897 %<imageobject><imagedata fileref="figs/bad-merge-3.png"/></imageobject> |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
898 % \caption{Backing out the merge, favoring the other parent} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
899 % \caption{Backing out the merge, favoring the other parent} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
900 \caption{$B%^!<%8$r%P%C%/%"%&%H$7!$$b$&0lJ}$N?F$rA*$V(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
901 \label{fig:undo:bad-merge-3} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
902 \end{figure} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
903 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
904 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
905 % \item Redo the bad merge by merging the two backout heads, |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
906 %which reduces the number of heads in the repository to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
907 %two, as can be seen in \ref{fig:undo:bad-merge-4}. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
908 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
909 \item $BLdBj$N$"$C$?%^!<%8$r!$%P%C%/%"%&%H$N7k2L@8$8$?(B2$B$D$N%X%C%I$N4V$G:F(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
910 $B$S9T$&!%$3$l$K$h$j!$?^(B\ref{fig:undo:bad-merge-4}$B$N$h$&$K%j%]%8%H%j(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
911 $BFb$N%X%C%I$O(B2$B$D$K$J$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
912 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
913 \begin{figure}[htb] |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
914 \centering |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
915 \grafix{figs/bad-merge-4} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
916 %<imageobject><imagedata fileref="figs/bad-merge-4.png"/></imageobject> |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
917 % \caption{Merging the backouts} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
918 \caption{$B%P%C%/%"%&%H7k2L$r%^!<%8$9$k(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
919 \label{fig:undo:bad-merge-4} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
920 \end{figure} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
921 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
922 % \item Merge with the commit that was made after the bad merge, as shown |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
923 % in \ref{fig:undo:bad-merge-5}. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
924 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
925 \item $B?^(B\ref{fig:undo:bad-merge-5}$B$N$h$&$K!$4V0c$C$?%^!<%8$N8e$K9T$o$l(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
926 $B$?%3%_%C%H$H%^!<%8$9$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
927 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
928 \begin{figure}[htb] |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
929 \centering |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
930 \grafix{figs/bad-merge-5} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
931 %<imageobject><imagedata fileref="figs/bad-merge-5.png"/></imageobject> |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
932 % \caption{Merging the backouts} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
933 \caption{$B%P%C%/%"%&%H$N%^!<%8(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
934 \label{fig:undo:bad-merge-5} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
935 \end{figure} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
936 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
937 \end{enumerate} |
307 | 938 |
939 | |
940 %\subsection{Protect yourself from ``escaped'' changes} | |
941 \subsection{$B0oC&$7$?JQ99$+$i<+J,<+?H$r<i$k(B} | |
201
80fc720338a5
Mention use of hooks to defend against propagation of bad changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
200
diff
changeset
|
942 |
307 | 943 %If you've committed some changes to your local repository and they've |
944 %been pushed or pulled somewhere else, this isn't necessarily a | |
945 %disaster. You can protect yourself ahead of time against some classes | |
946 %of bad changeset. This is particularly easy if your team usually | |
947 %pulls changes from a central repository. | |
948 | |
949 $B%m!<%+%k%j%]%8%H%j$K$$$/$D$+$NJQ99$r%3%_%C%H$7!$$=$l$i$,JL$N=j$K%W%C%7%e(B | |
950 $B$^$?$O%W%k$5$l$F$$$F!$I,$:$7$bBg:R32$H$O8@$($J$$!%$"$J$?$O$$$/$D$+$N%/%i(B | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
951 $B%9$N4V0c$C$?JQ99$+$i<+J,<+?H$G?H$r<i$k$3$H$,$G$-$k!%$3$l$O$"$J$?$N%A!<%`(B |
307 | 952 $B$,Cf1{$N%j%]%8%H%j$+$iJQ99$r%W%k$7$F$$$k>l9g$OFC$K4JC1$G$"$k!%(B |
201
80fc720338a5
Mention use of hooks to defend against propagation of bad changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
200
diff
changeset
|
953 |
307 | 954 %By configuring some hooks on that repository to validate incoming |
955 %changesets (see chapter~\ref{chap:hook}), you can automatically | |
956 %prevent some kinds of bad changeset from being pushed to the central | |
957 %repository at all. With such a configuration in place, some kinds of | |
958 %bad changeset will naturally tend to ``die out'' because they can't | |
959 %propagate into the central repository. | |
960 %Better yet, this happens without any need for explicit intervention. | |
201
80fc720338a5
Mention use of hooks to defend against propagation of bad changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
200
diff
changeset
|
961 |
307 | 962 $BCf1{%j%]%8%H%j$N>e$G!$JQ99E~Ce$K%U%C%/$r@_Dj$9$k!J(B\ref{chap:hook}$B$r;2>H!K(B |
963 $B$3$H$G!$$"$k<o$N8m$C$?%A%'%s%8%;%C%H$,Cf1{%j%]%8%H%j$K%3%_%C%H$5$l$k$N$r(B | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
964 $B<+F0E*$KKI$0$3$H$,$G$-$k!%@_Dj$r9T$&$3$H$G!$$"$k<o$N8m$C$?%A%'%s%8%;%C%H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
965 $B$OCf1{%j%]%8%H%j$KGH5Z$9$k$3$H$,$G$-$:;`LG$7$F$$$/!%9%ET9g$J$3$H$K!$;`LG(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
966 $B$OM[$K2pF~$9$kI,MW$J$/5/$-$k!#(B |
307 | 967 |
968 %For instance, an incoming change hook that verifies that a changeset | |
969 %will actually compile can prevent people from inadvertantly ``breaking | |
970 %the build''. | |
971 | |
972 $BNc$($P!$%A%'%s%8%;%C%H$r<B:]$K%3%s%Q%$%k$9$kJQ99E~Ce%U%C%/$O!$ITCm0U$K$h(B | |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
973 $B$C$F%S%k%IITG=$H$J$k$3$H$rKI$08z2L$,$"$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
974 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
975 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
976 %\subsection{What to do about sensitive changes that escape} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
977 \subsection{$B8D?M>pJs$r4^$`%A%'%s%8%;%C%H$NO31L(B} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
978 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
979 %Even a carefully run project can suffer an unfortunate event such as the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
980 %committing and uncontrolled propagation of a file that contains |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
981 %important passwords. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
982 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
983 $B%W%m%8%'%/%H$rCm0U?<$/1?1D$7$F$$$F$b!$;~$H$7$F=EMW$J%Q%9%o!<%I$N4^$^$l$?(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
984 $B%U%!%$%k$N%3%_%C%H$dEAGE$,@8$8$k$3$H$,$"$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
985 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
986 %If something like this happens to you, and the information that gets |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
987 %accidentally propagated is truly sensitive, your first step should be to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
988 %mitigate the effect of the leak without trying to control the leak |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
989 %itself. If you are not 100\% certain that you know exactly who could |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
990 %have seen the changes, you should immediately change passwords, cancel |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
991 %credit cards, or find some other way to make sure that the information |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
992 %that has leaked is no longer useful. In other words, assume that the |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
993 %change has propagated far and wide, and that there's nothing more you |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
994 %can do. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
995 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
996 $BO31L$,5/$-!$EAGE$7$?>pJs$,6K$a$F=EMW$J>l9g!$$^$:$9$Y$-$3$H$OO31L<+BN$r%3(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
997 $B%s%H%m!<%k$7$h$&$H$9$k$N$G$O$J$/!$O31L$K$h$k1F6A$rLH$l$k$h$&$K$9$k$3$H$G(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
998 $B$"$k!%C/$,$3$N>pJs$r8+$?$N$+(B100\%$BL@Gr$G$J$$>l9g$O!$$9$0$K%Q%9%o!<%I$rJQ99(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
999 $B$7!$>l9g$K$h$C$F$O%/%l%8%C%H%+!<%I$r2rLs$7$?$j!$O31L$7$?>pJs$,L58z$K$J$k(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1000 $B$h$&$K2DG=$J<j$rBG$D$Y$-$G$"$k!%JL$N8@$$J}$r$9$l$P!$>pJs$O$9$G$KBg$-$JHO(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1001 $B0O$K9-$^$C$F$*$j!$O31L$7$?>pJs<+BN$K$D$$$F$O$J$9=Q$,$J$$$H2>Dj$9$Y$-$G$"(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1002 $B$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1003 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1004 %You might hope that there would be mechanisms you could use to either |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1005 %figure out who has seen a change or to erase the change permanently |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1006 %everywhere, but there are good reasons why these are not possible. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1007 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1008 $BJQ99$rH/8+$7$??M$rFCDj$7$?$j!$$"$i$f$k>l=j$GJQ99$r1J5WE*$KJQ99$9$k%a%+%K(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1009 $B%:%`$,Hw$o$C$F$$$k$N$G$O$J$$$+$H4|BT$9$k8~$-$b$"$k$@$m$&$,!$$3$l$,<!$N$h(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1010 $B$&$JM}M3$GIT2DG=$G$"$k!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1011 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1012 %Mercurial does not provide an audit trail of who has pulled changes from |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1013 %a repository, because it is usually either impossible to record such |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1014 %information or trivial to spoof it. In a multi-user or networked |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1015 %environment, you should thus be extremely skeptical of yourself if you |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1016 %think that you have identified every place that a sensitive changeset |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1017 %has propagated to. Don't forget that people can and will send bundles |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1018 %by email, have their backup software save data offsite, carry |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1019 %repositories on USB sticks, and find other completely innocent ways to |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1020 %confound your attempts to track down every copy of a problematic change. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1021 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1022 Mercurial$B$O!$%j%]%8%H%j$+$iC/$,JQ99$r%W%k$7$?$+DI@W$9$k5!9=$r;}$?$J$$!%$J(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1023 $B$<$J$i$=$N$h$&$J>pJs$r5-O?$9$k$3$H$OIT2DG=$G$"$k$+4JC1$K56$l$k$+$i$G$"(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1024 $B$k!%=>$C$F!$%^%k%A%f!<%64D6-$d%M%C%H%o!<%/4D6-$G$O!$8D?M>pJs$r4^$`%A%'%s(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1025 $B%8%;%C%H$,EAGE$7$?HO0O$rFCDj$G$-$k$H9M$($k$Y$-$G$O$J$$!%LdBj$N$"$k%A%'%s(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1026 $B%8%;%C%H$rDI@W$7$h$&$H$7$?$H$3$m$G!$%A%'%s%8%;%C%H$rF~<j$7$??M!9$O!$(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1027 \begin{itemize} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1028 \item $B%P%s%I%k$rEE;R%a!<%k$GAw?.$9$k(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1029 \item $B%5%$%H30$K%G!<%?$rJ]B8$G$-$k%P%C%/%"%C%W%=%U%H%&%'%"$rMQ$$$k(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1030 \item USB$B%a%b%j$K%j%]%8%H%j$rJ]B8$9$k(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1031 \item $B$=$l0J30$NM=4|$7$J$$J}K!$rMQ$$$k(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1032 \end{itemize} |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1033 $B$J$I$NJ}K!$G$$$/$i$G$bDI@W$r5=$/$3$H$,2DG=$@$H$$$&$3$H$r3P$($F$*$/$Y$-$@!%(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1034 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1035 %Mercurial also does not provide a way to make a file or changeset |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1036 %completely disappear from history, because there is no way to enforce |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1037 %its disappearance; someone could easily modify their copy of Mercurial |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1038 %to ignore such directives. In addition, even if Mercurial provided such |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1039 %a capability, someone who simply hadn't pulled a ``make this file |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1040 %disappear'' changeset wouldn't be affected by it, nor would web crawlers |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1041 %visiting at the wrong time, disk backups, or other mechanisms. Indeed, |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1042 %no distributed revision control system can make data reliably |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1043 %vanish. Providing the illusion of such control could easily give a false |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1044 %sense of security, and be worse than not providing it at all. |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1045 |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1046 Mercurial$B$O%U%!%$%k$d%A%'%s%8%;%C%H$rMzNr$+$i40A4$K>C$75n$k5!G=$rDs6!$7$J(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1047 $B$$!%$3$l$O>C5n$r6/@)$9$k$3$H$,IT2DG=$G$"$k$3$H$K$h$k!%2>$K$=$N$h$&$J;X<((B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1048 $B$r<BAu$7$?$H$7$F$b!$(BMercurial$B$r2~B$$7$F;X<($rL5;k$9$k$h$&$K$9$k$3$H$OMF0W(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1049 $B$G$"$k!%$^$?!$(BMercurial$B$,$=$N$h$&$J5!G=$rDs6!$7$?$H$7$F!$(B``$B$3$N%U%!%$%k$r(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1050 $B>C$;(B''$B$H$$$&%A%'%s%8%;%C%H$r%W%k$7$F$$$J$$%f!<%6$d%?%$%_%s%00-$/%5%$%H$r(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1051 $BK,Ld$7$?%5!<%A%(%s%8%s$N%/%m!<%i!<!$%G%#%9%/%P%C%/%"%C%W$=$NB>$K$O2?$b1F(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1052 $B6A$r5Z$\$5$J$$!%<B:]$N$H$3$m!$J,;6%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$G?.Mj@-(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1053 $B$N$"$k%G!<%?>CLG5!G=$rDs6!$7$F$$$k$b$N$O$J$$!%$3$N$h$&$J@)8f$,2DG=$@$H$7(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1054 $B$F$b!$$3$l$OMF0W$K%;%-%e%j%F%#>e$N6<0R$K$J$j!$@)8f5!G=$,0l@Z$J$$>l9g$h$j(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1055 $B$b?<9o$J>uBV$r0z$-5/$3$9!%(B |
201
80fc720338a5
Mention use of hooks to defend against propagation of bad changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
200
diff
changeset
|
1056 |
308 | 1057 %\section{Finding the source of a bug} |
1058 \section{$B%P%0$N860x$r8+$D$1$k(B} | |
200
9bba958be4c6
Mention automatic example generation.
Bryan O'Sullivan <bos@serpentine.com>
parents:
131
diff
changeset
|
1059 \label{sec:undo:bisect} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1060 |
308 | 1061 %While it's all very well to be able to back out a changeset that |
1062 %introduced a bug, this requires that you know which changeset to back | |
1063 %out. Mercurial provides an invaluable command, called | |
1064 %\hgcmd{bisect}, that helps you to automate this process and accomplish | |
1065 %it very efficiently. | |
1066 | |
1067 $B%P%0$rH/@8$5$;$?%A%'%s%8%;%C%H$r%P%C%/%"%&%H$9$k$?$a$K$O!$$I$N%A%'%s%8%;%C(B | |
1068 $B%H$G%P%0$N:.F~$,5/$-$?$N$+$rCN$i$M$P$J$i$J$$!%(BMercurial$B$O(B\hgcmd{bisect} | |
1069 $B$H$$$&M-MQ$J%3%^%s%I$rDs6!$7$F$*$j!$$3$l$K$h$C$F%A%'%s%8%;%C%H$NFCDj$r<+(B | |
1070 $BF02=$7!$%P%C%/%"%&%H$r6K$a$F8z2LE*$K9T$&$3$H$,$G$-$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1071 |
308 | 1072 %The idea behind the \hgcmd{bisect} command is that a changeset has |
1073 %introduced some change of behaviour that you can identify with a | |
1074 %simple binary test. You don't know which piece of code introduced the | |
1075 %change, but you know how to test for the presence of the bug. The | |
1076 %\hgcmd{bisect} command uses your test to direct its search for the | |
1077 %changeset that introduced the code that caused the bug. | |
1078 | |
1079 \hgcmd{bisect}$B%3%^%s%I$NGX8e$K$O!$%A%'%s%8%;%C%H$K$h$C$FC1=c$J%P%$%J%j%F(B | |
1080 $B%9%H$G==J,<1JL2DG=$J5sF0$NJQ2=$,@8$l$k$H$$$&9M$(J}$,$"$k!%$"$J$?$O$I$N%3!<(B | |
1081 $B%I$,JQ2=$r0z$-5/$3$7$?$N$+$O$o$+$i$J$$$,!$%P%0$,5/$-$F$$$k$+$r%F%9%H$9$k(B | |
1082 $BJ}K!$OCN$C$F$$$k!%(B\hgcmd{bisect}$B%3%^%s%I$O!$%F%9%H$K$h$C$F%P%0$r0z$-5/$3(B | |
1083 $B$7$?%A%'%s%8%;%C%H$rFCDj$9$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1084 |
309 | 1085 %Here are a few scenarios to help you understand how you might apply |
1086 %this command. | |
1087 %\begin{itemize} | |
1088 %\item The most recent version of your software has a bug that you | |
1089 % remember wasn't present a few weeks ago, but you don't know when it | |
1090 % was introduced. Here, your binary test checks for the presence of | |
1091 % that bug. | |
1092 %\item You fixed a bug in a rush, and now it's time to close the entry | |
1093 % in your team's bug database. The bug database requires a changeset | |
1094 % ID when you close an entry, but you don't remember which changeset | |
1095 % you fixed the bug in. Once again, your binary test checks for the | |
1096 % presence of the bug. | |
1097 %\item Your software works correctly, but runs~15\% slower than the | |
1098 % last time you measured it. You want to know which changeset | |
1099 % introduced the performance regression. In this case, your binary | |
1100 % test measures the performance of your software, to see whether it's | |
1101 % ``fast'' or ``slow''. | |
1102 %\item The sizes of the components of your project that you ship | |
1103 % exploded recently, and you suspect that something changed in the way | |
1104 % you build your project. | |
1105 %%\end{itemize} | |
1106 | |
1107 $B0J2<$O$3$N%3%^%s%I$r$I$N$h$&$KE,MQ$G$-$k$N$+M}2r$r=u$1$k%7%J%j%*$G$"$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1108 \begin{itemize} |
309 | 1109 \item $B%P%0$,5/$-$F$$$J$+$C$?:G$b?7$7$$%P!<%8%g%s$r3P$($F$$$k$,!$$I$N%P!<(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1110 $B%8%g%s$G%P%0$,:.F~$7$?$+J,$+$i$J$$!%$3$3$G%P%$%J%j%F%9%H$r9T$$!$(B |
309 | 1111 $B%P%0$NB8:_$rD4$Y$k!%(B |
1112 \item $B%P%0$rBg5^$.$G=$@5$7!$$"$J$?$N%A!<%`$N%P%0%G!<%?%Y!<%9$r%/%m!<%:(B | |
1113 $B$9$k!%%P%0%G!<%?%Y!<%9$O$I$3$G%P%0$,=$@5$5$l$?$+$N%A%'%s%8%;%C%H(B | |
1114 $B$N(BID$B$rI,MW$H$9$k$,!$$"$J$?$O$I$N%A%'%s%8%;%C%H$G=$@5$5$l$?$+5-21(B | |
1115 $B$7$F$$$J$$!%$3$3$G$^$?%P%0$NB8:_$r%P%$%J%j%F%9%H$9$k!%(B | |
1116 \item $B$"$J$?$N%=%U%H%&%'%"$O@5$7$/F0$$$?$,!$0JA0B,Dj$7$?;~$h$j$b(B15\%$BCY(B | |
1117 $B$/$J$C$F$$$?!%$"$J$?$O$I$N%A%'%s%8%;%C%H$,$3$N@-G=Nt2=$r$b$?$i$7(B | |
1118 $B$?$N$+CN$j$?$$!%$3$N>l9g!$%P%$%J%j%F%9%H$GB.EY$rB,Dj$9$k!%(B | |
1119 \item $B=P2Y$9$k%W%m%8%'%/%H$N%3%s%]!<%M%s%H%5%$%:$,:G6aGzH/E*$KA}$($?!%(B | |
1120 $B$"$J$?$O%W%m%8%'%/%H$N%S%k%I$NJ}K!$K$J$s$i$+$NJQ2=$,5/$-$?$N$G$O(B | |
1121 $B$J$$$+$H5?$C$F$$$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1122 \end{itemize} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1123 |
309 | 1124 %From these examples, it should be clear that the \hgcmd{bisect} |
1125 %command is not useful only for finding the sources of bugs. You can | |
1126 %use it to find any ``emergent property'' of a repository (anything | |
1127 %that you can't find from a simple text search of the files in the | |
1128 %tree) for which you can write a binary test. | |
308 | 1129 |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1130 $B$3$NNc$+$i!$(B\hgcmd{bisect}$B%3%^%s%I$OC1$K%P%0$N=j:_$rC5$9$N$KLrN)$D$@$1$G(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1131 $B$O$J$/!"%P%$%J%j%F%9%H$rMQ0U$G$-$k$N$G$"$l$P!"%j%]%8%H%j$G5/$-$?$"$i$f$k(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1132 $BJQ2=!JC1$K%D%j!<$r%F%-%9%H%5!<%A$7$?$N$G$OH/8+$G$-$J$$JQ2=!K$rCN$k$N$K;H(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1133 $B$($k$3$H$,$o$+$k!#(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1134 |
309 | 1135 %We'll introduce a little bit of terminology here, just to make it |
1136 %clear which parts of the search process are your responsibility, and | |
1137 %which are Mercurial's. A \emph{test} is something that \emph{you} run | |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1138 %when \hgcmd{bisect} chooses a changeset. A \emph{probe} is what |
309 | 1139 %\hgcmd{bisect} runs to tell whether a revision is good. Finally, |
1140 %we'll use the word ``bisect'', as both a noun and a verb, to stand in | |
1141 %for the phrase ``search using the \hgcmd{bisect} command''. | |
1142 | |
1143 $B$3$3$G%5!<%A$N$I$N%Q!<%H$,$"$J$?$N@UG$$KB0$7!$$I$N%Q!<%H$,(BMercurial$B$KB0$9(B | |
1144 $B$k$N$+L@3N$K$9$k$?$a$K>/$7$P$+$jMQ8l$rF3F~$9$k!%(B\emph{test}$B$O(B\emph{$B$"$J(B | |
1145 $B$?(B}$B$,(B\hgcmd{bisect}$B$r<B9T$9$k;~$KA*$s$@%A%'%s%8%;%C%H$G$"$k!%(B | |
1146 \emph{probe}$B$O(B\hgcmd{bisect}$B$,%j%S%8%g%s$,NI$$$+H=Dj$9$k%j%S%8%g%s$G$"$k!%(B | |
1147 ``bisect''$B$H$$$&C18l$r(B``\hgcmd{bisect}$B%3%^%s%I$r;H$C$F%5!<%A$9$k(B''$B$H$$$&(B | |
1148 $B$3$H$NF15A8l$H$7$FL>;l$HF0;lN>J}$GMQ$$$k!%(B | |
1149 | |
1150 %One simple way to automate the searching process would be simply to | |
1151 %probe every changeset. However, this scales poorly.If it took ten | |
1152 %minutes to test a single changeset, and you had 10,000 changesets in | |
1153 %your repository, the exhaustive approach would take on average~35 | |
1154 %\emph{days} to find the changeset that introduced a bug. Even if you | |
1155 %knew that the bug was introduced by one of the last 500 changesets, | |
1156 %and limited your search to those, you'd still be looking at over 40 | |
1157 %hours to find the changeset that introduced your bug. | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1158 |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1159 $B%5!<%A%W%m%;%9$r<+F02=$9$kC1=c$JJ}K!$O!$A4$F$N%A%'%s%8%;%C%H$r(Bprobe$B$9$k$3(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1160 $B$H$G$"$k!%$7$+$7$3$l$OKX$s$I%9%1!<%k$7$J$$!%0l$D$N%A%'%s%8%;%C%H$N%A%'%C(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1161 $B%/$K(B10$BJ,$+$+$j!$%j%]%8%H%j$K%A%'%s%8%;%C%H$,(B10000$B$"$C$?$H$7$?$i!$iMDY$7$N(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1162 $B%"%W%m!<%A$O%P%0$rH/@8$5$;$?%A%'%s%8%;%C%H$NFCDj$KJ?6Q$G(B35$BF|$+$+$k!%%P%0(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1163 $B$,:G8e$N(B500$B%A%'%s%8%;%C%H$GH/@8$7$?$3$H$,J,$+$C$F$$$F!$%5!<%A$r$=$l$i$N%A%'(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1164 $B%s%8%;%C%H$K8BDj$7$?$H$7$F$b!$%P%0$r0z$-5/$3$7$?%A%'%s%8%;%C%H$NFCDj$K(B40 |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1165 $B;~4V0J>e$+$+$k!%(B |
309 | 1166 |
1167 %What the \hgcmd{bisect} command does is use its knowledge of the | |
1168 %``shape'' of your project's revision history to perform a search in | |
1169 %time proportional to the \emph{logarithm} of the number of changesets | |
1170 %to check (the kind of search it performs is called a dichotomic | |
1171 %search). | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1172 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1173 \hgcmd{bisect}$B$O%W%m%8%'%/%H$N%j%S%8%g%sMzNr$N(B``$B7A>u(B''$B$N>pJs$r!$%5!<%A$9(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1174 $B$Y$-%A%'%s%8%;%C%H?t$N(B\emph{$BBP?t(B}$B$KHfNc$7$?;~4V$G%5!<%A$9$k$?$a$K;H(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1175 $B$&!%!JFsJ,C5:w$r9T$&!%!K(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1176 |
309 | 1177 %With this approach, searching through 10,000 changesets will |
1178 %take less than three hours, even at ten minutes per test (the search | |
1179 %will require about 14 tests). Limit your search to the last hundred | |
1180 %changesets, and it will take only about an hour (roughly seven tests). | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1181 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1182 $B$3$N%"%W%m!<%A$K$h$j!$(B10000$B$N%A%'%s%8%;%C%H$KBP$9$k%5!<%A$O!$%5!<%A0l2s$"(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1183 $B$?$j(B10$BJ,$+$+$C$?$H$7$F$b(B3$B;~4V0J2<$G=*N;$9$k!%%F%9%H2s?t$O(B14$B2s$H$J$k!%:G8e(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1184 $B$N(B100$B$N%A%'%s%8%;%C%H$K8BDj$9$k$J$i$P!$%F%9%H$O$*$h$=(B1$B;~4VDxEY$G=*N;$7!$(B |
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1185 $B%F%9%H2s?t$O(B7$B2s$H$J$k!%(B |
309 | 1186 |
1187 %The \hgcmd{bisect} command is aware of the ``branchy'' nature of a | |
1188 %Mercurial project's revision history, so it has no problems dealing | |
1189 %with branches, merges, or multiple heads in a repoository. It can | |
1190 %prune entire branches of history with a single probe, which is how it | |
1191 %operates so efficiently. | |
1192 | |
1193 \hgcmd{bisect}$B%3%^%s%I$O!$(BMercurial$B%W%m%8%'%/%H$N%j%S%8%g%sMzNr$,;^J,$+$l(B | |
1194 $B$7$,$A$J@-<A$r;}$D$3$H$rG0F,$K$*$$$F@_7W$5$l$F$*$j!$%j%]%8%H%j$K%V%i%s%A!$(B | |
1195 $B%^!<%8!$J#?t$N%X%C%I$,$"$C$F$bLdBj$J$/<h$j07$($k!%0l2s$N(Bprobe$B$GMzNr$NCf(B | |
1196 $B$N$"$kJ,;^A4$F$r4"$k$3$H$,$G$-$k$?$a!$6K$a$F8zN(E*$KF0:n$9$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1197 |
313 | 1198 %\subsection{Using the \hgcmd{bisect} command} |
1199 \subsection{\hgcmd{bisect}$B%3%^%s%I$r;H$&(B} | |
1200 | |
1201 %Here's an example of \hgcmd{bisect} in action. | |
1202 \hgcmd{bisect}$B$NF0:n$rNc$G<($9!%(B | |
282 | 1203 |
313 | 1204 %\begin{note} |
1205 % In versions 0.9.5 and earlier of Mercurial, \hgcmd{bisect} was not a | |
1206 % core command: it was distributed with Mercurial as an extension. | |
1207 % This section describes the built-in command, not the old extension. | |
1208 %\end{note} | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1209 |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1210 \begin{note} |
313 | 1211 $B%P!<%8%g%s(B0.9.5$B0JA0$N(BMercurial$B$G$O!$(B\hgcmd{bisect}$B$O%3%"%3%^%s%I$G$O$J(B |
1212 $B$/!$(Bextension$B$H$7$F(BMercurial$B$KF1:-$5$l$F$$$?!%$3$N@a$O8E$$(Bextension$B$K$D(B | |
1213 $B$$$F$G$O$J$/!$%S%k%H%$%s%3%^%s%I$H$7$F$N(B\hgcmd{bisect}$B$K$D$$$F=R$Y$F$$$k!%(B | |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1214 \end{note} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1215 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1216 %Now let's create a repository, so that we can try out the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1217 %\hgcmd{bisect} command in isolation. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1218 %\interaction{bisect.init} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1219 %We'll simulate a project that has a bug in it in a simple-minded way: |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1220 %create trivial changes in a loop, and nominate one specific change |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1221 %that will have the ``bug''. This loop creates 35 changesets, each |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1222 %adding a single file to the repository. We'll represent our ``bug'' |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1223 %with a file that contains the text ``i have a gub''. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1224 %\interaction{bisect.commits} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1225 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1226 $BFHN)$7$F(B\hgcmd{bisect}$B$r;n$;$k$h$&$K%j%]%8%H%j$r:n@.$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1227 \interaction{bisect.init} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1228 $BC1=c$J%P%0$N$"$k%W%m%8%'%/%H$r%7%_%e%l!<%H$9$k!%%P%0$O7+JV$7A`:n$N4V$K<+(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1229 $BL@$JJQ99$r9T$$!$FCDj$N(B1$B$D$NJQ99$r%P%0$r;}$D$H;XL>$9$k!%$3$N%k!<%W$O(B35 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1230 $B$N%A%'%s%8%;%C%H$r:n$j!$3F!9!$(B1$B$D$N%U%!%$%k$r%j%]%8%H%j$KDI2C$9$k!%%P%0(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1231 $B$O(B``i have a gub''$B$H$$$&J8;zNs$r;}$D%U%!%$%k$GI=8=$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1232 \interaction{bisect.commits} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1233 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1234 %The next thing that we'd like to do is figure out how to use the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1235 %\hgcmd{bisect} command. We can use Mercurial's normal built-in help |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1236 %mechanism for this. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1237 %\interaction{bisect.help} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1238 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1239 $B<!$K(B\hgcmd{bisect}$B$N;H$$J}$r@bL@$7$?$$!%(BMercurial$B$N%S%k%H%$%s$N%X%k%W$,(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1240 $B;H$($k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1241 \interaction{bisect.help} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1242 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1243 %The \hgcmd{bisect} command works in steps. Each step proceeds as follows. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1244 %\begin{enumerate} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1245 %\item You run your binary test. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1246 % \begin{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1247 % \item If the test succeeded, you tell \hgcmd{bisect} by running the |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1248 % \hgcmdargs{bisect}{--good} command. |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1249 % \item If it failed, run the \hgcmdargs{bisect}{--bad} command. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1250 % \end{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1251 %\item The command uses your information to decide which changeset to |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1252 % test next. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1253 %\item It updates the working directory to that changeset, and the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1254 % process begins again. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1255 %\end{enumerate} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1256 %The process ends when \hgcmd{bisect} identifies a unique changeset |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1257 %that marks the point where your test transitioned from ``succeeding'' |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1258 %to ``failing''. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1259 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1260 \hgcmd{bisect}$B%3%^%s%I$OCJ3,$rF'$s$GF0:n$9$k!%3FCJ3,$O0J2<$N$h$&$K?J$`!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1261 \begin{enumerate} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1262 \item $B%P%$%J%j%F%9%H$r<B9T$9$k(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1263 \begin{itemize} |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1264 \item $B%F%9%H$,@.8y$7$?>l9g!$(B\hgcmd{bisect}$B$r0z?t(B\hgcmdargs{bisect}{--good} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1265 $B$rIU$1$F<B9T$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1266 \item $B%F%9%H$,<:GT$7$?>l9g$O(B\hgcmdargs{bisect}{--bad}$B%3%^%s%I$r<B9T$9(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1267 $B$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1268 \end{itemize} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1269 \item $B%3%^%s%I$O0z?t$GEO$5$l$?>pJs$r;H$C$F<!$K$I$N%A%'%s%8%;%C%H$r%F%9(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1270 $B%H$9$Y$-$+7hDj$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1271 \item $B%3%^%s%I$O%o!<%-%s%0%G%#%l%/%H%j$r$=$N%A%'%s%8%;%C%H$K99?7$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1272 $B%W%m%;%9$r:F3+$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1273 \end{enumerate} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1274 \hgcmd{bisect}$B$N%W%m%;%9$O!$%F%9%H$,@.8y$+$i<:GT$XJQ2=$7$?%A%'%s%8%;%C%H(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1275 $B$rFCDj$G$-$k$H=*N;$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1276 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1277 %To start the search, we must run the \hgcmdargs{bisect}{--reset} command. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1278 %\interaction{bisect.search.init} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1279 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1280 $B%5!<%A$r;O$a$k$K$O(B\hgcmdargs{bisect}{--reset}$B$r<B9T$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1281 \interaction{bisect.search.init} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1282 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1283 %In our case, the binary test we use is simple: we check to see if any |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1284 %file in the repository contains the string ``i have a gub''. If it |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1285 %does, this changeset contains the change that ``caused the bug''. By |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1286 %convention, a changeset that has the property we're searching for is |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1287 %``bad'', while one that doesn't is ``good''. |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1288 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1289 $B$3$N%1!<%9$G$O!$%P%$%J%j%F%9%H$OC1=c$G!$%j%]%8%H%jFb$K(B``i have a gub''$B$r(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1290 $B4^$`%U%!%$%k$,$"$k$+$I$&$+$r%A%'%C%/$9$k$@$1$G$"$k!%$b$7$3$l$,$"$l$P!$$=(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1291 $B$N%A%'%s%8%;%C%H$,%P%0$r0z$-5/$3$7$F$$$kJQ99$r4^$s$G$$$k$H$$$&$3$H$K$J$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1292 $B47Nc$K=>$C$F!$C5$7$F$$$k%A%'%s%8%;%C%H$r(B``bad''$B!$$=$l0J30$r(B``good''$B$H8F(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1293 $B$V$3$H$K$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1294 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1295 %Most of the time, the revision to which the working directory is |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1296 %synced (usually the tip) already exhibits the problem introduced by |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1297 %the buggy change, so we'll mark it as ``bad''. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1298 %\interaction{bisect.search.bad-init} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1299 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1300 $BBgDq$N>l9g!$%o!<%-%s%0%G%#%l%/%H%j$,F14|$7$F$$$k%j%S%8%g%s!JDL>o$O(Btip$B$N(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1301 $B$O$:$@!K$O!$%P%0$N$"$kJQ99$K$h$C$F0z$-5/$3$5$l$?LdBj$r<($7$F$$$k$N$G!$$3(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1302 $B$N%j%S%8%g%s$r(B``bad''$B$H%^!<%/$9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1303 \interaction{bisect.search.bad-init} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1304 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1305 %Our next task is to nominate a changeset that we know \emph{doesn't} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1306 %have the bug; the \hgcmd{bisect} command will ``bracket'' its search |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1307 %between the first pair of good and bad changesets. In our case, we |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1308 %know that revision~10 didn't have the bug. (I'll have more words |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1309 %about choosing the first ``good'' changeset later.) |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1310 %\interaction{bisect.search.good-init} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1311 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1312 $B<!$K%P%0$r(B\emph{$B4^$^$J$$(B}$B%j%S%8%g%s$r;XL>$9$k!%(B\hgcmd{bisect}$B%3%^%s%I$O(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1313 $B:G=i$N(B``good''$B%A%'%s%8%;%C%H$H(B``bad''$B%A%'%s%8%;%C%H$r%V%i%1%C%H$9$k!%$3(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1314 $B$NNc$G$O!$%j%S%8%g%s(B~10$B$O%P%0$r;}$?$J$$$HJ,$+$C$F$$$k!%!J:G=i$N(B``good'' |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1315 $B%A%'%s%8%;%C%H$NA*$SJ}$K$D$$$F$O8e=R$9$k!%!K(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1316 \interaction{bisect.search.good-init} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1317 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1318 %Notice that this command printed some output. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1319 %\begin{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1320 %\item It told us how many changesets it must consider before it can |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1321 % identify the one that introduced the bug, and how many tests that |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1322 % will require. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1323 %\item It updated the working directory to the next changeset to test, |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1324 % and told us which changeset it's testing. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1325 %\end{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1326 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1327 $B%3%^%s%I$+$i=PNO$,$"$k$3$H$KCm0U!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1328 \begin{itemize} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1329 \item $B%P%0$NF~$C$?%A%'%s%8%;%C%H$rFCDj$9$k$^$G$K9MN8$9$Y$-%A%'%s%8%;%C%H(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1330 $B$N8D?t$H!$I,MW$J8!::$N2s?t$rI=<($9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1331 \item $B%o!<%-%s%0%G%#%l%/%H%j$r<!$N%F%9%H$9$Y$-%A%'%s%8%;%C%H$K99?7$7!$(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1332 $B$I$N%A%'%s%8%;%C%H$r%F%9%H$7$F$$$k$N$+$rI=<($9$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1333 \end{itemize} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1334 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1335 %We now run our test in the working directory. We use the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1336 %\command{grep} command to see if our ``bad'' file is present in the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1337 %working directory. If it is, this revision is bad; if not, this |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1338 %revision is good. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1339 %\interaction{bisect.search.step1} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1340 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1341 $B$3$3$G%o!<%-%s%0%G%#%l%/%H%j$G%F%9%H$r9T$&$3$H$,$G$-$k!%(B\command{grep}$B%3(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1342 $B%^%s%I$r;H$C$F(B``bad''$B%U%!%$%k$,%o!<%-%s%0%G%#%l%/%H%j$K$"$k$+$I$&$+$r%A%'%C(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1343 $B%/$9$k!%$b$7B8:_$9$l$P!$%j%S%8%g%s$O(Bbad$B$G!$B8:_$7$J$1$l$P%j%S%8%g%s$O(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1344 good$B$H$$$&$3$H$K$J$k!%(B |
131
153efeaa8f57
Fix stupid build bugs.
Bryan O'Sullivan <bos@serpentine.com>
parents:
130
diff
changeset
|
1345 \interaction{bisect.search.step1} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1346 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1347 %This test looks like a perfect candidate for automation, so let's turn |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1348 %it into a shell function. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1349 %\interaction{bisect.search.mytest} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1350 %We can now run an entire test step with a single command, |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1351 %\texttt{mytest}. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1352 %\interaction{bisect.search.step2} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1353 %A few more invocations of our canned test step command, and we're |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1354 %done. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1355 %\interaction{bisect.search.rest} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1356 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1357 $B$3$N%F%9%H$O40A4$K<+F02=$G$-$k!%%7%'%k4X?t$K$7$F$_$h$&!%(B |
131
153efeaa8f57
Fix stupid build bugs.
Bryan O'Sullivan <bos@serpentine.com>
parents:
130
diff
changeset
|
1358 \interaction{bisect.search.mytest} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1359 $B%F%9%HA4BN$r0l$D$N(B\texttt{mytest}$B%3%^%s%I$H$7$F<B9T$G$-$k$h$&$K$J$C$?!%(B |
131
153efeaa8f57
Fix stupid build bugs.
Bryan O'Sullivan <bos@serpentine.com>
parents:
130
diff
changeset
|
1360 \interaction{bisect.search.step2} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1361 $B$3$N%Q%C%/$5$l$?%F%9%H%3%^%s%I$r5/F0$9$k$@$1$G%F%9%H$,40N;$9$k!%(B |
131
153efeaa8f57
Fix stupid build bugs.
Bryan O'Sullivan <bos@serpentine.com>
parents:
130
diff
changeset
|
1362 \interaction{bisect.search.rest} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1363 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1364 %Even though we had~40 changesets to search through, the \hgcmd{bisect} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1365 %command let us find the changeset that introduced our ``bug'' with |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1366 %only five tests. Because the number of tests that the \hgcmd{bisect} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1367 %command grows logarithmically with the number of changesets to |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1368 %search, the advantage that it has over the ``brute force'' search |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1369 %approach increases with every changeset you add. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1370 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1371 40$B8D$N%A%'%s%8%;%C%H$,$"$k$K$b$+$+$o$i$:!$(B\hgcmd{bisect}$B%3%^%s%I$O%P%0$r(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1372 $B$b$?$i$7$?%A%'%s%8%;%C%H$r(B5$B2s$N%F%9%H$GH/8+$9$k$3$H$,$G$-$?!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1373 \hgcmd{bisect}$B$N%F%9%H2s?t$OC5:w$9$Y$-%A%'%s%8%;%C%H?t$,A}$($k$K=>$C$F!$(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1374 $BBP?tE*$KA}$($k$,!$iMDY$7C5:w$KBP$9$kM%0L@-$O!$%A%'%s%8%;%C%H$,A}2C$9$k$K(B |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1375 $B=>$C$FA}2C$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1376 |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1377 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1378 %\subsection{Cleaning up after your search} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1379 \subsection{$B%5!<%A8e$N%/%j!<%s%"%C%W(B} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1380 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1381 %When you're finished using the \hgcmd{bisect} command in a |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1382 %repository, you can use the \hgcmdargs{bisect}{--reset} command to drop |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1383 %the information it was using to drive your search. The command |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1384 %doesn't use much space, so it doesn't matter if you forget to run this |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1385 %command. However, \hgcmd{bisect} won't let you start a new search in |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1386 %that repository until you do a \hgcmdargs{bisect}{--reset}. |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1387 %\interaction{bisect.search.reset} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1388 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1389 $B%j%]%8%H%jFb$G(B\hgcmd{bisect}$B%3%^%s%I$r;H$$=*$C$?8e$K(B |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1390 \hgcmdargs{bisect}{--reset}$B%3%^%s%I$GC5:w$K;H$C$?>pJs$r>C5n$9$k$3$H$,$G$-(B |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1391 $B$k!%%3%^%s%I$OBg$-$J%9%Z!<%9$r;H$&$o$1$G$O$J$$$N$G!$$3$N%3%^%s%I$r<B9T$9(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1392 $B$k$N$rK:$l$F$bFC$KLdBj$O$J$$!%$7$+$7(B\hgcmd{bisect}$B$O(B |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1393 \hgcmdargs{bisect}{--reset}$B$,<B9T$5$l$k$^$G!$$=$N%j%]%8%H%jFb$G?7$?$JC5:w(B |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1394 $B$r;O$a$k$3$H$O$G$-$J$$!%(B |
131
153efeaa8f57
Fix stupid build bugs.
Bryan O'Sullivan <bos@serpentine.com>
parents:
130
diff
changeset
|
1395 \interaction{bisect.search.reset} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1396 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1397 %\section{Tips for finding bugs effectively} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1398 \section{$B8zN(E*$J%P%0$NH/8+K!(B} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1399 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1400 %\subsection{Give consistent input} |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1401 \subsection{$B@5$7$$F~NO$r9T$&(B} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1402 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1403 %The \hgcmd{bisect} command requires that you correctly report the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1404 %result of every test you perform. If you tell it that a test failed |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1405 %when it really succeeded, it \emph{might} be able to detect the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1406 %inconsistency. If it can identify an inconsistency in your reports, |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1407 %it will tell you that a particular changeset is both good and bad. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1408 %However, it can't do this perfectly; it's about as likely to report |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1409 %the wrong changeset as the source of the bug. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1410 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1411 \hgcmd{bisect}$B%3%^%s%I$O3F%F%9%H$G@5$7$/7k2L$rF~NO$9$k$3$H$,I,MW$G$"$k!%(B |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1412 $B$b$7%F%9%H$K@.8y$7$?$N$K<:GT$HF~NO$9$l$P!$L7=b$,@8$8$&$k!%F~NO$NCf$KL7=b(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1413 $B$,$"$k$3$H$,J,$+$l$P!$%3%^%s%I$OFCDj$N%A%'%s%8%;%C%H$r(Bgood$B$+$D(Bbad$B$HI=<($9(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1414 $B$k!%$7$+$7L7=b$r40`z$K8+$D$1=P$9$3$H$O:$Fq$G!$8m$C$?%A%'%s%8%;%C%H$r%P%0(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1415 $B$N5/8;$HJs9p$9$k2DG=@-$,9b$$!%(B |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1416 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1417 %\subsection{Automate as much as possible} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1418 \subsection{$B$G$-$k8B$j<+F02=$9$k(B} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1419 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1420 %When I started using the \hgcmd{bisect} command, I tried a few times |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1421 %to run my tests by hand, on the command line. This is an approach |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1422 %that I, at least, am not suited to. After a few tries, I found that I |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1423 %was making enough mistakes that I was having to restart my searches |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1424 %several times before finally getting correct results. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1425 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1426 \hgcmd{bisect}$B%3%^%s%I$r;H$$$O$8$a$?;~!$?t2s!$%3%^%s%I%i%$%s$+$i<j$G%F%9(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1427 $B%H$r<B9T$7$?!%$3$NJ}K!$OE,$7$?J}K!$G$O$J$$!%?t2s$N%F%9%H$N8e$G!$:G=*E*$J(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1428 $B7k2L$rF@$k$?$a$K%5!<%A$r$d$j$J$*$5$J$1$l$P$J$i$J$$$3$H$K5$$E$/$3$H$,2?EY(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1429 $B$+$"$C$?!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1430 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1431 %My initial problems with driving the \hgcmd{bisect} command by hand |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1432 %occurred even with simple searches on small repositories; if the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1433 %problem you're looking for is more subtle, or the number of tests that |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1434 %\hgcmd{bisect} must perform increases, the likelihood of operator |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1435 %error ruining the search is much higher. Once I started automating my |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1436 %tests, I had much better results. |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1437 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1438 \hgcmd{bisect}$B%3%^%s%I$r<j$G<B9T$7$F$$$?;~$N:G=i$NLdBj$O!$>.$5$J%j%]%8%H(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1439 $B%j$G$NC1=c$J%5!<%A$G$b5/$3$C$?!%$b$7LdBj$,$b$C$HNt0-$G!$(B\hgcmd{bisect}$B$,(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1440 $B<B9T$7$J$1$l$P$J$i$J$$%F%9%H$N?t$,A}$($l$P!$%*%Z%l!<%?$N%(%i!<$,5/$3$k2D(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1441 $BG=@-$O$:$C$H9b$/$J$k!%0lEY%F%9%H$r<+F02=$7$F$+$i$O!$$:$C$H$h$$7k2L$,F@$i(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1442 $B$l$k$h$&$K$J$C$?!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1443 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1444 %The key to automated testing is twofold: |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1445 %\begin{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1446 %\item always test for the same symptom, and |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1447 %\item always feed consistent input to the \hgcmd{bisect} command. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1448 %\end{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1449 %In my tutorial example above, the \command{grep} command tests for the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1450 %symptom, and the \texttt{if} statement takes the result of this check |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1451 %and ensures that we always feed the same input to the \hgcmd{bisect} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1452 %command. The \texttt{mytest} function marries these together in a |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1453 %reproducible way, so that every test is uniform and consistent. |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1454 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1455 $B%F%9%H$r<+F02=$9$k%-!<$O(B2$B$D$"$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1456 \begin{itemize} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1457 \item $B>o$KF1$8C{8u$r%F%9%H$9$k!%$=$7$F(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1458 \item $B>o$K(B\hgcmd{bisect}$B%3%^%s%I$K0l4S$7$?F~NO$r9T$&!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1459 \end{itemize} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1460 $B>e$N%A%e!<%H%j%"%kNc$G$O(B\command{grep}$B%3%^%s%I$,C{8u$r%F%9%H$7$F$*$j!$(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1461 \texttt{if}$BJ8$,$3$N%A%'%C%/$N7k2L$r<h$j!$>o$KF1$8F~NO$,(B\hgcmd{bisect}$B%3(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1462 $B%^%s%I$K$J$5$l$k$h$&$K$J$C$F$$$?!%(B\texttt{mytest}$B4X?t$O!$:F8=2DG=$JJ}K!(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1463 $B$G!$$3$l$i$r7k$S$D$1!$$3$3$N%F%9%H$,0lMM$G0l4S$9$k$h$&$K$J$C$F$$$?!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1464 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1465 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1466 %\subsection{Check your results} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1467 \subsection{$B7k2L$r%A%'%C%/$9$k(B} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1468 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1469 %Because the output of a \hgcmd{bisect} search is only as good as the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1470 %input you give it, don't take the changeset it reports as the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1471 %absolute truth. A simple way to cross-check its report is to manually |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1472 %run your test at each of the following changesets: |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1473 %\begin{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1474 %\item The changeset that it reports as the first bad revision. Your |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1475 % test should still report this as bad. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1476 %\item The parent of that changeset (either parent, if it's a merge). |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1477 % Your test should report this changeset as good. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1478 %\item A child of that changeset. Your test should report this |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1479 % changeset as bad. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1480 %\end{itemize} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1481 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1482 \hgcmd{bisect}$B%5!<%A$N=PNO$O!$%f!<%6$NF~NO$,@5$7$$>l9g$K8B$C$F@5$7$$$N$G!$(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1483 $B%3%^%s%I$,Js9p$9$k%A%'%s%8%;%C%H$r@dBP$K@5$7$$$H9M$($F$O$$$1$J$$!%Js9p$N(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1484 $B%/%m%9%A%'%C%/$r9T$&C1=c$JJ}K!$O!$0J2<$N%A%'%s%8%;%C%H$KBP$7$F!$<jF0$G%F(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1485 $B%9%H$r9T$&$3$H$G$"$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1486 \begin{itemize} |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1487 \item $B:G=i$N(Bbad$B%j%S%8%g%s$H$7$FJs9p$5$l$k%A%'%s%8%;%C%H!%$3$l$K$D$$$F%F(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1488 $B%9%H$O(Bbad$B$H$J$kH&$G$"$k(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1489 \item $B$=$N%A%'%s%8%;%C%H$N?F!J%^!<%8$5$l$F$$$k$J$iN>J}$N?F!K!%%F%9%H$O(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1490 good$B$K$J$kH&$G$"$k(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1491 \item $B:G=i$N(Bbad$B%j%S%8%g%s$H$7$FJs9p$5$l$k%A%'%s%8%;%C%H$N;R!%%F%9%H$O(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1492 bad$B$H$J$kH&$G$"$k(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1493 \end{itemize} |
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1494 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1495 %\subsection{Beware interference between bugs} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1496 \subsection{$B%P%0F1;N$NAj8_43>D$KN10U$9$k(B} |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1497 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1498 %It's possible that your search for one bug could be disrupted by the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1499 %presence of another. For example, let's say your software crashes at |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1500 %revision 100, and worked correctly at revision 50. Unknown to you, |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1501 %someone else introduced a different crashing bug at revision 60, and |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1502 %fixed it at revision 80. This could distort your results in one of |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1503 %several ways. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1504 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1505 $B0l$D$N%P%0$KBP$9$k%5!<%A$,$=$NB>$N%P%0$NB8:_$G:.Mp$5$;$i$l$k$3$H$,M-$jF@(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1506 $B$k!%Nc$($P%=%U%H%&%'%"$,%j%S%8%g%s(B100$B$G%/%i%C%7%e$7!$%j%S%8%g%s(B50$B$GF0:n(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1507 $B$7$?$H$9$k!%$"$J$?$K$OL$CN$@$,!$C/$+JL$N?M$,%j%S%8%g%s(B60$B$GB>$N%/%i%C%7%e(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1508 $B$9$k%P%0$r;}$A9~$_!$%j%S%8%g%s(B80$B$G=$@5$7$?$H$9$k!%$3$l$O7k2L$rJ#?t$NJ}8~(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1509 $B$XY`6J$2F@$k!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1510 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1511 %It is possible that this other bug completely ``masks'' yours, which |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1512 %is to say that it occurs before your bug has a chance to manifest |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1513 %itself.If you can't avoid that other bug (for example, it prevents |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1514 %your project from building), and so can't tell whether your bug is |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1515 %present in a particular changeset, the \hgcmd{bisect} command cannot |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1516 %help you directly. Instead, you can mark a changeset as untested by |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1517 %running \hgcmdargs{bisect}{--skip}. |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1518 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1519 $B$3$NJL$N%P%0$,DI$$$+$1$F$$$k%P%0$r40A4$K%^%9%/$7$F$7$^$&$3$H$bM-$jF@$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1520 $BDI$$$+$1$F$$$k%P%0$,L@$i$+$K$J$kA0$K$3$l$,5/$-$k$3$H$bM-$jF@$k!%B>$N%P%0(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1521 $B$,KI$.@Z$l$J$$$J$i!$%P%0$,FCDj$N%A%'%s%8%;%C%H$K4^$^$l$k$H8@$&$3$H$b$G$-(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1522 $B$J$$!%(B\hgcmd{bisect}$B%3%^%s%I$OD>@\$"$J$?$r=u$1$k$3$H$,$G$-$J$$!%$=$NBe$o(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1523 $B$j!$$"$k%A%'%s%8%;%C%H$r(B\hgcmdargs{bisect}{--skip}$B$K$h$C$FL$%F%9%H$H%^!<(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1524 $B%/$9$k$3$H$,$G$-$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1525 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1526 %A different problem could arise if your test for a bug's presence is |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1527 %not specific enough. If you check for ``my program crashes'', then |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1528 %both your crashing bug and an unrelated crashing bug that masks it |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1529 %will look like the same thing, and mislead \hgcmd{bisect}. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1530 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1531 $B%P%0$N%F%9%H$,==J,$K>\:Y$G$J$+$C$?>l9g!$JL$NLdBj$,5/$3$jF@$k!%%W%m%0%i%`(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1532 $B$,%/%i%C%7%e$9$k$+$I$&$+$r%A%'%C%/$7$F$$$k;~!$DI@W$7$F$$$k%/%i%C%7%e%P%0(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1533 $B$H!$$=$l$H$OL54X78$J%/%i%C%7%e%P%0$,:.:_$F$$$k$H$3$l$i$OF1$8$K8+$($F$7$^(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1534 $B$$!$7k2LE*$K%A%'%C%/$r%^%9%/$7$F$7$^$$!$(B\hgcmd{bisect}$B$r%_%9%j!<%I$9$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1535 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1536 %Another useful situation in which to use \hgcmdargs{bisect}{--skip} is |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1537 %if you can't test a revision because your project was in a broken and |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1538 %hence untestable state at that revision, perhaps because someone |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1539 %checked in a change that prevented the project from building. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1540 |
835
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1541 \hgcmdargs{bisect}{--skip}$B$,M-8z$JJL$NNc$H$7$F!$%S%k%IITG=$K$J$kJQ99$,(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1542 $B%A%'%C%/%$%s$5$l$?%j%S%8%g%s$,$"$j!$$3$l$rHt$P$5$J$1$l$P%F%9%H$,$G$-$J$$(B |
8a3041e6f3cb
reflect comments by Hiroshi Someya.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
348
diff
changeset
|
1543 $B$h$&$J>u67$,$"$k!%(B |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1544 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1545 %\subsection{Bracket your search lazily} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1546 \subsection{$BC5:w$rBUBF$K%V%i%1%C%H$9$k(B} |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1547 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1548 %Choosing the first ``good'' and ``bad'' changesets that will mark the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1549 %end points of your search is often easy,but it bears a little |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1550 %discussion nevertheless. From the perspective of \hgcmd{bisect}, the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1551 %``newest'' changeset is conventionally ``bad'', and the older |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1552 %changeset is ``good''. |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1553 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1554 $B:G=i$N(Bgood$B$H(Bbad$B%A%'%s%8%;%C%H$NAH$rA*$S!$%5!<%AHO0O$r;XDj$9$k$N$OB?$/$N(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1555 $B>l9g4JC1$@$,!$<c43$N5DO@$NM>CO$,$"$k!%(B\hgcmd{bisect}$B$+$i8+$?;~!$:G?7$N%A%'(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1556 $B%s%8%;%C%H$O(Bbad$B$G!$8E$$%A%'%s%8%;%C%H$O(Bgood$B$H$J$k!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1557 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1558 %If you're having trouble remembering when a suitable ``good'' change |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1559 %was, so that you can tell \hgcmd{bisect}, you could do worse than |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1560 %testing changesets at random. Just remember to eliminate contenders |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1561 %that can't possibly exhibit the bug (perhaps because the feature with |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1562 %the bug isn't present yet) and those where another problem masks the |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1563 %bug (as I discussed above). |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1564 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1565 $BE,@Z$J(Bgood$B%A%'%s%8%;%C%H$r3P$($F$$$J$$;~!$(B\hgcmd{bisect}$B$K$=$l$r;XDj$9$k(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1566 $B$H!$%i%s%@%`$KA*$V$h$j$b0-$$C5:w$r9T$&2DG=@-$,$"$k!%%P%0$r<($5$J$$!J$*$=(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1567 $B$i$/%P%0$N$"$k5!G=$,<BAu$5$l$F$$$J$$!K%A%'%s%8%;%C%H$H!$B>$NLdBj$,DI@WCf(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1568 $B$N%P%0$r%^%9%/$7$F$7$^$&$h$&$J%A%'%s%8%;%C%H$N$_$r>C5n$9$k$3$H$r3P$($F$*(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1569 $B$/$Y$-$@!%(B |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1570 |
314
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1571 %Even if you end up ``early'' by thousands of changesets or months of |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1572 %history, you will only add a handful of tests to the total number that |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1573 %\hgcmd{bisect} must perform, thanks to its logarithmic behaviour. |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1574 |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1575 \hgcmd{bisect}$B$,9T$o$J$1$l$P$J$i$J$$%F%9%H$N2s?t$O!$BP>]$H$9$k%A%'%s%8%;%C(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1576 $B%H$NBP?t$KHfNc$9$k$?$a!$?t%u7n$K5Z$VMzNr$NCf$N?t@i$N%A%'%s%8%;%C%H$NCf$K(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1577 $BBP$7$F$b>/?t$N%F%9%H$rDI2C$9$k$@$1$G:Q$`!%(B |
aa132d5e2b32
completed draft translation for undo.tex.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
313
diff
changeset
|
1578 |
130
26b7a4e943aa
Describe the bisect extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
129
diff
changeset
|
1579 |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1580 %%% Local Variables: |
291
504f23b4f625
started japanese translation
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
290
diff
changeset
|
1581 %%% mode: yatex |
121
9094c9fda8ec
Start chapter on error recovery.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1582 %%% TeX-master: "00book" |
837
b775f963b18c
Clean up chapter 8, and add content
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
835
diff
changeset
|
1583 %%% End: |