hgbook
view ja/branch.tex @ 856:22cce9e3c445
Validation typos.
| author | gpiancastelli |
|---|---|
| date | Sat Aug 22 22:14:55 2009 +0200 (2009-08-22) |
| parents | |
| children |
line source
1 \chapter{Managing releases and branchy development}
2 \label{chap:branch}
4 Mercurial $B$O!"(B
5 $BF1;~JB9TE*$K3+H/$r?J$a$k$h$&$J%W%m%8%'%/%H$r4IM}$G$-$k;EAH$_$r;}$C$F$$$^$9!#(B
6 $B$3$l$i$N;EAH$_$rM}2r$9$k$?$a$K!"(B
7 $B$^$:$O0lHLE*$J%=%U%H%&%'%"3+H/$N;EAH$_$rD/$a$F$_$^$7$g$&!#(B
9 $BB?$/$N%=%U%H%&%'%"%W%m%8%'%/%H$G$O!"(B
10 $B=EMW$J?75,5!G=$r4^$`(B``$B%a%8%c!<(B''$B%j%j!<%9$r4V7gE*$KH/9T$7$^$9!#(B
11 $B$=$l$HJ?9T$7$F(B``$B%^%$%J!<(B''$B%j%j!<%9$bH/9T$9$k$3$H$,$"$j$^$9!#(B
12 $BB?$/$N>l9g!"(B
13 $B%^%$%J!<%j%j!<%9$O85$K$7$?%a%8%c!<%j%j!<%9$HF10l$G$9$,!"(B
14 $B%P%0$N=$@5$,$J$5$l$F$$$^$9!#(B
16 $B$3$N>O$G$O!"(B
17 $B!V%j%j!<%9!W$N$h$&$J%W%m%8%'%/%H$N%^%$%k%9%H!<%s$N!"(B
18 $B5-O?$rJ];}$9$kJ}K!$+$i@bL@$r;O$a$?$$$H;W$$$^$9!#(B
19 $B$=$N8e$G!"(B
20 $B%W%m%8%'%/%H$K$*$1$k%U%'!<%:0\9T$G$N:n6H$NN.$l$d!"(B
21 $B$=$N:]$N:n6H$d@.2LJ*$r(B
22 Mercurial $B$K$h$C$FJ,N%!?4IM}$9$kJ}K!$r@bL@$7$^$9!#(B
24 \section{Giving a persistent name to a revision}
26 $BFCDj$N%j%S%8%g%s$r(B``$B%j%j!<%9(B''$B$H8F$V$3$H$K7hDj$7$?$J$i!"(B
27 $B$=$N%j%S%8%g%s$N(B ID $B$r5-O?$9$k$Y$-$G$9!#(B
28 $B%j%S%8%g%s$N(B ID $B$r5-O?$9$k$3$H$G!"(B
29 $B8eF|2?$i$+$NM}M3!JNc$($P%P%0$N:F8=$d!"?75,%W%i%C%H%U%)!<%`$X$N0\?"Ey!K(B
30 $B$GI,MW$K$J$C$?:]$K%j%j!<%9$r:F8=$9$k$3$H$,$G$-$^$9!#(B
32 \interaction{tag.init}
34 \hgcmd{tag} $B%3%^%s%I$rMxMQ$9$k$3$H$G!"(B
35 Mercurial $B$OG$0U$N%j%S%8%g%s$K1JB3E*$JL>A0$rIUM?$7$^$9!#(B
36 $BFI<T$NM=A[DL$j!"$3$NL>A0$N$3$H$r(B``$B%?%0(B''$B$H8F$S$^$9!#(B
38 \interaction{tag.tag}
40 $B%j%S%8%g%s$K$H$C$F!"(B
41 $B%?%0$O(B``$B>]D'E*$JL>A0(B''(symbolic name) $B0J30$N2?<T$G$b$"$j$^$;$s!#(B
42 $B%?%0$O=c?h$KMxJX@-$N$?$a$KB8:_$9$k$b$N$G!"(B
43 $B%j%S%8%g%s$r;2>H$9$k:]$N<j7Z$G1JB3E*$J<jCJ$H$J$j$^$9!#(B
44 Mercurial $B$O!"(B
45 $BMxMQ<T$NMQ$$$k%?%0L>$N0UL#$r2r<a$7$?$j$7$^$;$s!#(B
46 $B[#Kf$5$,L5$/2r@O$G$-$k$3$H$rJ]>Z$9$k$?$a$KI,MW$J>/!9$N@)Ls$r=|$$$F$O!"(B
47 $B%?%0L>$K2?$i$+$N@)Ls$r$D$1$?$j$9$k$3$H$b$"$j$^$;$s!#(B
48 $B0J2<$N$$$:$l$NJ8;z$b%?%0L>$K$O;HMQ$G$-$^$;$s!#(B
50 \begin{itemize}
51 \item $B%3%m%s(B(ASCII 58, ``\texttt{:}'')
52 \item $B9TF,0\F0(B\footnote{carriage return} (ASCII 13, ``\Verb+\r+'')
53 \item $B2~9T(B (ASCII 10, ``\Verb+\n+'')
54 \end{itemize}
56 \hgcmd{tags} $B%3%^%s%I$r;HMQ$9$k$3$H$G!"(B
57 $B%j%]%8%H%j$,J];}$7$F$$$k%?%0$rI=<($5$;$k$3$H$,$G$-$^$9!#(B
58 \hgcmd{tags} $B%3%^%s%I$N=PNO$K$*$$$F!"(B
59 $B8D!9$N%?%0IU$1$5$l$?%j%S%8%g%s$O!"(B
60 $B;O$a$K%?%0L>$G!"<!$K%j%S%8%g%sHV9f$G!"(B
61 $B:G8e$K0l0U$N%j%S%8%g%s%O%C%7%eCM$G<1JL$5$l$^$9!#(B
63 \interaction{tag.tags}
65 \texttt{tip} $B%?%0$,(B \hgcmd{tags}
66 $B%3%^%s%I$N=PNO$KNs5s$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B
67 \texttt{tip} $B$O!">o$K%j%]%8%H%jCf$N:G?7$N%j%S%8%g%s$r;X$9(B
68 ``$BN.F0E*$J(B''$BFC<l%?%0$G$9!#(B
70 \hgcmd{tags} $B%3%^%s%I$N=PNO$G$O!"(B
71 $B%?%0$O%j%S%8%g%sHV9f$N5U=g!J9_=g!K$GNs5s$5$l$F$$$^$9!#(B
72 $B$3$l$O:G?7$N%?%0$O8E$$%?%0$h$j$b@h$KNs5s$5$l$k$3$H$r0UL#$7!"(B
73 $B$=$l$OF1;~$K(B \hgcmd{tags} $B$,=PNO$9$k%?%00lMw$N:G=i$K(B
74 \texttt{tip} $B$,I=<($5$l$k$3$H$b0UL#$7$^$9!#(B
76 \hgcmd{log} $B%3%^%s%I$N<B9T;~$K!"(B
77 $B%?%0$H4XO"IU$1$i$l$?%j%S%8%g%s$rI=<($9$k>l9g!"(B
78 \hgcmd{log} $B%3%^%s%I$O%?%0$rI=<($7$^$9!#(B
80 \interaction{tag.log}
82 Mercurial $B%3%^%s%I$KBP$7$F%j%S%8%g%s<1JL;R$r;XDj$9$kI,MW$,$"$k>l9g!"(B
83 $B%j%S%8%g%s<1JL;R$r;XDj$9$k0LCV$G$O!"(B
84 $B>o$K%?%0L>$r;HMQ$9$k$3$H$,$G$-$^$9!#(B
85 Mercurial $B$NFbIt$G$O!"(B
86 $B%?%0L>$rBP1~$9$k%j%S%8%g%s<1JL;R$KJQ49$7$F$+$i;HMQ$7$F$$$^$9!#(B
88 \interaction{tag.log.v1.0}
90 $BC10l$N%j%]%8%H%j$,J];}$G$-$k%?%0$N?t$K$b!"(B
91 $BC10l$N%j%S%8%g%s$KIUM?$G$-$k%?%0$N?t$K$b@)8B$O$"$j$^$;$s!#(B
92 $B8=<BE*$JLdBj$H$7$F!"(B
93 $B%?%0$OC1$K%j%S%8%g%s$NFCDj$rJd=u$9$k$b$N$G$9$+$i!"(B
94 ``$B2a>j$K(B''$B!J6qBNE*$J?t$O%W%m%8%'%/%H$K1~$8$F0[$J$j$^$9$,!K(B
95 $B%?%0$rIUM?$9$k$N$O$h$m$7$/$"$j$^$;$s!#(B
96 $BB?$/$N%?%0$,$"$k$H!"%j%S%8%g%s$rFCDj$9$kMxJX@-$,Aa!9$K8:>/$7$F$7$^$$$^$9!#(B
98 $BNc$($P!"(B
99 $B$"$k%W%m%8%'%/%H$G$O?tF|Kh$NIQEY$G%^%$%k%9%H!<%s$r@_Dj$7$F$$$k$H$9$k$H!"(B
100 $B$=$l$>$l$N%^%$%k%9%H!<%s$K%?%0$rIUM?$9$k$N$O6K$a$F9gM}E*$G$9!#(B
101 $B$7$+$7!"A4$F$N%j%S%8%g%s$G3N<B$Ke:No$J%S%k%I$,$G$-$k7QB3E*(B
102 $B!J(Bcontinuous$B!K$J%S%k%I%7%9%F%`$,$"$k>l9g$O!"(B
103 $Be:No$J%S%k%IKh$K%?%0$rIUM?$9$k$H!"BgNL$N%N%$%:$r;}$A9~$`$3$H$K$J$j$^$9!#(B
104 $B$=$NBe$o$j$K!"(B
105 $B%S%k%I$,<:GT$9$k%j%S%8%g%s!J$3$N;vBV$,5)$@$H2>Dj$7$F$$$^$9!*!K(B
106 $B$K%?%0$rIUM?$9$k$+!"(B
107 $B%S%k%I$N2DH]$rDI@W$9$k%?%0$N;HMQ$r;_$a$k$N$,NI$$$G$7$g$&!#(B
109 $BI,MW$NL5$/$J$C$?%?%0$r:o=|$7$?$$>l9g$O(B
110 \hgcmdargs{tag}{--remove} $B%3%^%s%I$r;HMQ$7$^$9!#(B
112 \interaction{tag.remove}
114 $BG$0U$N;~E@$G%?%0$N4XO"IU$1$rJQ99$9$k$3$H$b$G$-$^$9$N$G!"(B
115 $B?75,$N(B \hgcmd{tag} $B%3%^%s%I<B9T$K$h$j!"(B
116 $BF10l$N%?%0$,0[$J$k%j%S%8%g%s$r<1JL$9$k$h$&$K$J$j$^$9!#(B
117 \emph{$BK\Ev$K(B}$B%?%0$r99?7$7$?$$$3$H$r(B Mercurial $B$KEA$($k$?$a$K!"(B
118 \hgopt{tag}{-f} $B%*%W%7%g%s$r;HMQ$7$J$1$l$P$J$j$^$;$s!#(B
120 \interaction{tag.replace}
122 $B%?%0$N99?78e$b!"(B
123 $B%?%0$,0JA0$K<1JL$7$F$$$?%j%S%8%g%s$K4X$9$k1JB3E*$J5-O?$,;D$j$^$9$,!"(B
124 Mercurial $B$,$=$l$r;HMQ$9$k$3$H$O$"$j$^$;$s!#(B
125 $B$3$N$h$&$K!"(B
126 $B4V0c$C$?%j%S%8%g%s$X$N%?%0$NIUM?$K$O2?$NITMx1W$b$"$j$^$;$s$N$G!"(B
127 $B%?%0IU$1$r4V0c$C$?$J$i!"@5$7$$%j%S%8%g%s$K%?%0$rIUM?$7D>$;$P$h$$$N$G$9!#(B
129 Mercurial $B$O!"(B
130 $B%j%]%8%H%jCf$N%j%S%8%g%s4IM}$5$l$?DL>o%U%!%$%k$K%?%0$N>pJs$r3JG<$7$F$$$^$9!#(B
131 $B2?$i$+$N%?%0$rIUM?$9$k$H!"(B
132 \sfilename{.hgtags} $B%U%!%$%kCf$K$=$N%?%0$r8+$D$1$k$3$H$,$G$-$k$G$7$g$&!#(B
133 \hgcmd{tag} $B%3%^%s%I$r<B9T$9$k$H!"(B
134 Mercurial $B$O$3$N%U%!%$%k$rJQ99$7!"<+F0E*$KJQ99$r%3%_%C%H$7$^$9!#(B
135 $B$3$N$3$H$O!"(B
136 \hgcmd{tag} $B%3%^%s%I$r<B9T$7$?:]$K$O!"(B
137 $B>o$KBP1~$9$k%A%'%s%8%;%C%H$r(B \hgcmd{log} $B%3%^%s%I$N=PNO$G8+$k$3$H$,$G$-$k!"(B
138 $B$H$$$&$3$H$r0UL#$7$F$$$^$9!#(B
140 \interaction{tag.tip}
142 \subsection{Handling tag conflicts during a merge}
144 \sfilename{.hgtags} $B%U%!%$%k$r5$$K$9$kI,MW$OKX$I$"$j$^$;$s$,!"(B
145 $B;~$K$O%^!<%8$N:]$K$=$NB8:_$,0U<1$5$l$k$3$H$,$"$j$^$9!#(B
146 $B$3$N%U%!%$%k$N7A<0$OC1=c$G!"O"B3$7$?9T$+$i9=@.$5$l$F$$$^$9!#(B
147 $B3F9T$O%A%'%s%8%;%C%H$N%O%C%7%eCM$G;O$^$j!"6uGr$H%?%0L>$,B3$-$^$9!#(B
149 $B%^!<%8$K$*$1$k(B
150 \sfilename{.hgtags} $B%U%!%$%k$N>WFM$r2r>C$9$k:]$K$O!"(B
151 \sfilename{.hgtags} $B%U%!%$%k=$@5$K$R$M$j$,I,MW$G$9!#(B
152 $B%j%]%8%H%jCf$N%?%0$r2r@O$9$k>l9g!"(B
153 Mercurial $B$O(B\emph{$B7h$7$F(B}
154 \sfilename{.hgtags} $B%U%!%$%k$N%o!<%-%s%0%3%T!<$r;2>H$9$k$3$H$O$"$j$^$;$s!#(B
155 $B$=$NBe$o$j$K!"(BMercurial
156 $B$O(B\emph{$B:G$b:G6a%3%_%C%H$5$l$?(B}$B%U%!%$%k$N%j%S%8%g%s$rD4$Y$^$9!#(B
158 $B$3$N$h$&$J@_7W$N;DG0$J7k2L$H$7$F!"(B
159 $B%^!<%8$7$?(B \sfilename{.hgtags} $B%U%!%$%k$,!"(B
160 $B$=$NJQ99$r%3%_%C%H$7$?(B\emph{$B8e$b(B}$B@5$7$$>uBV$G$"$k$3$H$r!"(B
161 $B<B:]$K8!>Z$9$k$3$H$,$G$-$^$;$s!#(B
162 $B%^!<%8$N:]$K(B \sfilename{.hgtags} $B%U%!%$%k$N>WFM$r2r>C$9$k:]$K$O!"(B
163 $B%3%_%C%H8e$K(B \hgcmd{tags} $B%3%^%s%I$N<B9T$rK:$l$:$K9T$C$F$/$@$5$$!#(B
164 \sfilename{.hgtags} $B%U%!%$%k$KIT@5$,$"$C$?>l9g!"(B
165 \hgcmd{tags} $B%3%^%s%I$OIT@5$N>l=j$rJs9p$7$^$9$N$G!"(B
166 $B$=$N2U=j$r=$@5$7$F%3%_%C%H$9$l$PNI$$$N$G$9!#(B
167 $BJQ99FbMF$N@5$7$5$r3NG'$9$k$?$a$K!"(B
168 $BJQ99$N8e$G!":FEY(B \hgcmd{tags} $B%3%^%s%I$r<B9T$7$F$/$@$5$$!#(B
170 \subsection{Tags and cloning}
172 \hgcmd{clone} $B%3%^%s%I$,(B
173 $BFCDj$N%A%'%s%8%;%C%H$r;XDj$7$F87L)$JJ#@=$r:n@.$9$k$?$a$N(B
174 \hgopt{clone}{-r} $B%*%W%7%g%s$r;}$C$F$$$k$3$H$K5$IU$$$F$$$k$+$b$7$l$^$;$s!#(B
175 $B?7$7$$J#@=$O!"(B
176 $B;XDj$7$?%j%S%8%g%s$h$j$b8e$K@8$8$?MzNr>pJs$r0l@Z;}$C$F$$$^$;$s!#(B
177 $B$3$N$3$H$,%?%0$HAj8_:nMQ$7$?>l9g!"!"(B
178 $BL}CG$7$F$$$k$H6C$+$5$l$k;vBV$K$J$j$^$9!#(B
180 $B%?%0$N@8@.$,!"(B
181 \sfilename{.hgtags} $B%U%!%$%k$X$N3JG<$N:]$K!"(B
182 $B0l$D$N%j%S%8%g%s$H$7$F07$o$l$k$3$H$r;W$$=P$;$P!"(B
183 $B%?%0$,5-O?$5$l$?%A%'%s%8%;%C%H$,!"(B
184 $B%?%0$NIUM?BP>]$H$J$k!J8E$$!K%A%'%s%8%;%C%H$r;2>H$9$k$N$OEvA3$N$3$H$G$9!#(B
185 $B%?%0(B \texttt{foo} $B;~E@$N%j%]%8%H%j$rJ#@=$9$k$?$a$K(B
186 \hgcmdargs{clone}{-r foo} $B$r<B9T$7$?>l9g!"(B
187 $BJ#@=$5$l$?%j%]%8%H%j$O!"(B
188 $BJ#@=$9$k:]$K;HMQ$5$l$?(B\emph{$B%?%0$N:n@.$K4X$9$kMzNr$r;}$C$F$$$^$;$s(B}$B!#(B
189 $B?7$7$$%j%]%8%H%j$K$O!"(B
190 $B%W%m%8%'%/%HMzNr$N40A4$J%5%V%;%C%H$,4^$^$l$^$9$,!"(B
191 $BM#0l!";XDj$KMQ$$$?%?%0$N>pJs$O(B\emph{$B4^$^$l$F$$$^$;$s(B}$B!#(B
193 \subsection{When permanent tags are too much}
195 Mercurial $B$N%?%0$O9=@.4IM}$5$l$F$*$j!"(B
196 $B%W%m%8%'%/%H$NMzNr$H0lBN2=$7$F$$$k$?$a!"(B
197 $BC/$+$,:n@.$7$?%?%0$O!"(B
198 $B0l=o$K:n6H$r9T$C$F$$$kC/$b$,8+$k$3$H$,$G$-$^$9!#(B
199 $B$7$+$7!"%j%S%8%g%s$KL>A0$rIU$1$k$3$H$O!"(B
200 $B%j%S%8%g%s(B \texttt{4237e45506ee} $B$,<B$O(B \texttt{v2.0.2} $B$G$"$k!"(B
201 $B$H$$$&$3$H$r=q$-N1$a$F$*$/0J>e$NM-MQ@-$,$"$j$^$9!#(B
202 $B9*L/$J%P%0$rDI@W$9$k:]$K!"(B
203 ``$B%"%s$,$3$N%j%S%8%g%s$G>I>u$r8+$+$1$?(B''$B$H$$$C$?N`$NHwK:O?$H$7$F!"(B
204 $B%?%0$rIUM?$7$?$$>l9g$b$"$k$G$7$g$&!#(B
206 $B$3$N$h$&$J>l9g!"(B
207 \emph{$B%m!<%+%k(B}$B$J%?%0$,:GE,$G$9!#(B
208 \hgopt{tag}{-l} $B%*%W%7%g%sIU$-$G(B
209 \hgcmd{tag} $B%3%^%s%I$r5/F0$9$k$3$H$G!"(B
210 $B%m!<%+%k%?%0$r:n@.$9$k$3$H$,$G$-$^$9!#(B
211 $B$3$N%3%^%s%I<B9T$N>l9g!"(B
212 $B%?%0$O(B \sfilename{.hg/localtags} $B%U%!%$%k$K3JG<$5$l$^$9(B
213 \sfilename{.hgtags} $B$H0[$J$j(B
214 \sfilename{.hg/localtags} $B$O9=@.4IM}$5$l$^$;$s!#(B
215 \hgopt{tag}{-l} $B$K$h$C$F:n@.$7$?%?%0$O!"(B
216 $B8=:_:n6H$r$7$F$$$k%j%]%8%H%j$KN1$^$jB3$1$^$9(B
217 \footnote{$BLuCm(B: \hgcmd{clone}$B!"(B\hgcmd{pull} $B$d(B
218 \hgcmd{push} $B$K$h$C$FB>$N%j%]%8%H%j$K%3%T!<$5$l$k$3$H$,$"$j$^$;$s(B}$B!#(B
220 \section{The flow of changes---big picture vs. little}
222 $B$3$3$G!"K\>O$NKAF,$G=R$Y$?35N,$KLa$j!"(B
223 $BJ#?t$NJ?9T$7$?3+H/$,F1;~$K9T$o$l$F$$$k%W%m%8%'%/%H$K$D$$$F9M$($F8+$^$7$g$&!#(B
225 $B?7$7$$(B``$B<g(B''$B%j%j!<%9$d!"(B
226 $B:G?7$N<g%j%j!<%9$KBP$9$k?7$?$J%^%$%J!<%P%0=$@5!"(B
227 $B8=:_$OJ]<i>uBV$K$"$k$h$&$J8E$$%j%j!<%9$KBP$9$kM=4|$;$L(B``hot fix''
228 $B$N$?$a$N(B push $B$,$"$k$G$7$g$&!#(B
230 $B3+H/$K$*$1$kMM!9$JJ?9T$7$?J}8~$r;2>H$9$k$?$a$N0lHLE*$JJ}K!$O!"(B
231 ``$B%V%i%s%A(B''$B$H8F$P$l$k$b$N$G$9!#(B
232 $B$7$+$7!"(B
233 Mercurial $B$,(B\emph{$BA4$F$NMzNr(B}$B$r(B
234 $B!V%V%i%s%A$H%^!<%8$NO"B3!W$H$7$F07$C$F$$$k$3$H$r!"(B
235 $B4{$K2?EY$b8+$F$-$^$7$?!#(B
236 $B<B:]$K$O!"(B
237 $BI=LLE*$K$O4X78$7$F$$$k$h$&$G!"(B
238 $B$=$N<B!"$?$^$?$^F1$8L>A0$G$"$k$@$1$N#2$D$N35G0$r07$C$F$$$k$N$G$9!#(B
240 \begin{itemize}
241 \item ``$B5p;kE*$J(B''$B%V%i%s%A$O!"%W%m%8%'%/%HH/E8$N9-$,$j$rI=$7!"(B
242 $BL>A0$r$D$1$?$j!"OCBj$K>e$C$?$j$7$^$9!#(B
244 \item ``$BHy;kE*$J(B''$B%V%i%s%A$O!"F|!9$N3+H/3hF0$H!"JQ99%^!<%8$N@.2L$G$9!#(B
245 $B$3$N%V%i%s%A$O!"%3!<%I$,$I$N$h$&$K3+H/$5$l$F$$$C$?$N$+$rJ*8l$j$^$9!#(B
247 \end{itemize}
249 \section{Managing big-picture branches in repositories}
251 Mercurial $B$K$*$$$F(B``$B5p;kE*$J(B''$B%V%i%s%A$r3VN%$9$k:G$b4JC1$JJ}K!$O!"(B
252 $B3VN%MQ$N%j%]%8%H%j$rMQ0U$9$k$3$H$G$9!#(B
253 $BNc$($P!"4{$K$"$k6&M-%j%]%8%H%j(B---$B$3$l$r(B \texttt{myproject} $B$H8F>N$7$^$9(B
254 ---$B$,(B ``1.0'' $B$H$$$&%^%$%k%9%H!<%s$KE~C#$7$F$$$k>l9g!"(B
255 1.0 $B%j%j!<%9$N$?$a$K;HMQ$7$?%j%S%8%g%s$K%?%0$rIUM?$9$k$3$H$G!"(B
256 1.0 $BHG$KBP$9$kMh$k$Y$-J]<i%j%j!<%9$N=`Hw$r9T$$$^$9!#(B
258 \interaction{branch-repo.tag}
260 $B%?%0IU$1$7$?;~E@$HF1$8FbMF$N(B
261 \texttt{myproject-1.0.1}
262 $B$H$$$&L>$N?7$7$$6&M-%j%]%8%H%j$rJ#@=$7$^$9!#(B
264 \interaction{branch-repo.clone}
266 $B$=$N8e!"(B
267 $BMh$k(B 1.0.1 $B%^%$%J!<%j%j!<%9$K4^$a$k$Y$-%P%0=$@5$N:n6H$,I,MW$K$J$C$?$J$i!"(B
268 \texttt{myproject-1.0.1} $B%j%]%8%H%j$rJ#@=$7JQ99$r9T$C$F!"(B
269 $B$=$N@.2L$rH?1G$7$^$9!#(B
271 \interaction{branch-repo.bugfix}
273 $B$=$N4V!"<!$N%a%8%c!<%j%j!<%9$X8~$1$?3+H/:n6H$O!"(B
274 $B%^%$%J!<%j%j!<%9$K4X$9$k:n6H$H$O3VN%$5$l$?>uBV$G!"(B
275 \texttt{myproject} $B%j%]%8%H%j$K$*$$$F3hH/$KB3$1$i$l$^$9!#(B
277 \interaction{branch-repo.new}
279 \section{Don't repeat yourself: merging across branches}
281 $BJ]<iMQ%V%i%s%A$G%P%0=$@5$r9T$C$?$H$9$k$H!"(B
282 $BB?$/$N>l9g!"%W%m%8%'%/%H$N%a%$%s%V%i%s%A$K(B
283 $B!J$=$7$F$=$l0J30$NJ]<i%V%i%s%A$K$*$$$F$b!K(B
284 $BF1$8%P%0$,B8:_$9$k2DG=@-$,$"$j$^$9!#(B
285 $BF1$8%P%0$r2?EY$bD>$7$?$$$H;W$&3+H/<T$O5)$G$9$+$i!"(B
286 $BF1$8:n6H$r7+$jJV$9$3$H$J$/%P%0=$@5$r4IM}$9$k$?$a$K(B
287 Mercurial $B$,Ds6!$9$k4v$D$+$NJ}K!$r8+$F$_$^$7$g$&!#(B
289 $B:G$bC1=c$JJ}K!$O!"(B
290 $B:n6HBP>]%V%i%s%A$+$iJ#@=$7$?%m!<%+%k%j%]%8%H%j$X!"(B
291 $BJ]<i%V%i%s%A$+$iJQ99$r(B pull $B$9$k$3$H$G$9!#(B
293 \interaction{branch-repo.pull}
295 $B$=$N>e$G#2$D$N%V%i%s%A$N$=$l$>$l$N%X%C%I$r%^!<%8$7!"(B
296 $B$=$N@.2L$r%a%$%s%V%i%s%A$KH?1G$7$^$9!#(B
298 \interaction{branch-repo.merge}
300 \section{Naming branches within one repository}
302 $BB?$/$N>l9g$O!"(B
303 $B%j%]%8%H%j$NJ,N%$K$h$C$F%V%i%s%A$rJ,N%$9$k$N$,E,@Z$J8/$jJ}$G$9!#(B
304 $BC1=c$G$9$+$iM}2r$b4JC1$G$9$7!"$=$l8N$K4V0c$($k$3$H$,$"$j$^$;$s!#(B
305 $B:n6H$7$F$$$k%V%i%s%A$H!"%3%s%T%e!<%?>e$N!J%j%]%8%H%j!K%G%#%l%/%H%j$N4V$G!"(B
306 $B#1BP#1$N4X78$,$G$-$F$$$^$9$N$G!"(B
307 $B%V%i%s%A!?%j%]%8%H%jCf$N%U%!%$%k$KBP$7$F!"(B
308 $B!J(BMercurial $B$r0U<1$7$J$$!KDL>o$N%D!<%k$r;HMQ$9$k$3$H$b$G$-$^$9!#(B
310 $B$"$J$?$,!J$=$7$F6&F1:n6H<T$b!K(B
311 ``$B%Q%o!<%f!<%6!<(B''$B$h$j$b9b$$%l%Y%k$K$"$k$N$G$"$l$P!"(B
312 $B%V%i%s%A(B(that you can consider XXXX)$B$r07$&JL$JJ}K!$,$"$j$^$9!#(B
313 $BA0$N@a$G$O!"(B
314 ``$BHy;kE*(B''$B%V%i%s%A$H(B``$B5p;kE*(B''$B%V%i%s%A$N!"(B
315 $BMxMQ<T%l%Y%k$G$N6hJL$K$D$$$F8@5Z$7$^$7$?!#(B
316 $BC10l$N%j%]%8%H%jCf$G!"(B
317 $B>o$KJ#?t$N(B``$BHy;kE*$J(B''$B%V%i%s%A(B
318 $B!JNc$($P!"JQ99$N(B pull $B8e$K%^!<%8$7$F$$$J$$>uBV!K$r07$C$F$$$k0lJ}$G!"(B
319 Mercurial $B$OJ#?t$N(B``$B5p;kE*$J(B''$B%V%i%s%A$r07$&$3$H(B\emph{$B$b(B}$B$G$-$^$9!#(B
321 Mercurial $B$,(B``$B5p;kE*$J(B''$B%V%i%s%A$r07$&:]$NMWE@$O!"(B
322 $B%V%i%s%A$K1JB3E*$J(B\emph{$BL>A0(B}$B$rIU$1$k$H$3$m$K$"$j$^$9!#(B
323 $BA0=R$N$h$&$K(B \texttt{default} $B$H$$$&L>A0$N%V%i%s%A$,>o$KB8:_$7$^$9$N$G!"(B
324 $B%V%i%s%A$X$NL?L>$r9T$&A0$G$"$C$F$b!"(B
325 $BC5$;$P(B \texttt{default} $B%V%i%s%A$N@W$r8+$D$1$k$3$H$,$G$-$^$9!#(B
327 $BNc$($P!"(B
328 \hgcmd{commit} $B%3%^%s%I$r<B9T$9$k$H!"(B
329 $B%(%G%#%?$,5/F0$5$l$F%3%_%C%H%a%C%;!<%8$rF~NO$G$-$^$9(B
330 \footnote{$BLuCm(B: Emacs $B$N(B hg-mode.el $B$r;HMQ$7$F$$$k>l9g$O8+$i$l$^$;$s(B}$B$,!"(B
331 $BKvHx$N(B ``\texttt{HG: branch default}'' $B$r4^$`9T$r8+$F$/$@$5$$!#(B
332 $B$3$l$O!"(B\texttt{default} $B$H$$$&L>A0$N%V%i%s%A$KBP$7$F%3%_%C%H$7$F$$$k!"(B
333 $B$H$$$&$3$H$rI=$7$F$$$^$9!#(B
335 $B%V%i%s%A$KL>A0$r$D$1$k$K$O!"(B
336 $B$^$:$O(B \hgcmd{branches} $B$r;HMQ$7$^$9!#(B
337 $B$3$N%3%^%s%I$O!"%j%]%8%H%jCf$K4{$KB8:_$9$kL>A0IU$-%V%i%s%A$H!"(B
338 $B8D!9$N%V%i%s%A$K$*$1$k@hF,!J(Btip$B!K%j%S%8%g%s$,$I$l$+$rNs5s$7$^$9!#(B
340 \interaction{branch-named.branches}
342 $B<B9TNc$G$O!"(B
343 $BL>A0IU$-%V%i%s%A$r@8@.$9$kA0$G$9$+$i!"(B
344 $BM#0lB8:_$9$k(B \texttt{default} $B$@$1$,I=<($5$l$^$9!#(B
346 $B$I$l$,(B``$B8=:_$N(B''$B%V%i%s%A$+$rCN$k$K$O!"(B
347 $B0z?tL5$7$G(B \hgcmd{branch} $B%3%^%s%I$r<B9T$7$^$9!#(B
348 $B$3$N%3%^%s%I$O!"(B
349 $B8=:_$N%A%'%s%8%;%C%H$N?F%A%'%s%8%;%C%H$,!"(B
350 $B$I$N%V%i%s%A>e$K$"$k$b$N$+$rI=<($7$^$9!#(B
352 \interaction{branch-named.branch}
354 $B?7$7$$%V%i%s%A$r:n@.$9$k$K$O!"(B
355 $B:FEY(B \hgcmd{branch} $B%3%^%s%I$r<B9T$7$^$9$,!"(B
356 $B:#2s$O@8@.$9$k%V%i%s%AL>$r0z?t$H$7$F;XDj$7$^$9!#(B
358 \interaction{branch-named.create}
360 $B%V%i%s%A@8@.8e!"(B
361 \hgcmd{branch} $B%3%^%s%I$K$h$j$I$N$h$&$JI{:nMQ$r@8$8$?$N$+!"(B
362 $B2x$7$`$+$b$7$l$^$;$s!#(B
363 \hgcmd{status} $B$d(B \hgcmd{tip} $B$N=PNO$O$I$&$J$C$F$$$k$G$7$g$&$+!)(B
365 \interaction{branch-named.status}
367 $B:n6HNN0h$KJQ99$O2C$($i$l$F$$$^$;$s$7!"(B
368 $BMzNr$KJQ2=$b$"$j$^$;$s!#(B
369 $B$3$N$3$H$,<(:6$7$F$$$k$h$&$K!"(B
370 \hgcmd{branch} $B%3%^%s%I$N<B9T$O2?$i1JB3E*$J8z2L$r;}$A$^$;$s!#(B
371 $B$3$N%3%^%s%I$O!"(B
372 \emph{$B<!2s$N(B}$B%A%'%s%8%;%C%H$N%3%_%C%H$N:]$K!"(B
373 $B2?$H$$$&%V%i%s%AL>$r;HMQ$9$k$+$r(B
374 Mercurial $B$KEA$($k$@$1$G$9!#(B
376 $BJQ99$r%3%_%C%H$9$k$H!"(B
377 Mercurial $B$O%3%_%C%H$5$l$?%A%'%s%8%;%C%H$K%V%i%s%AL>$r5-O?$7$^$9!#(B
378 $B0lC6(B \texttt{default} $B%V%i%s%A$+$iB>$N%V%i%s%A$K@Z$jBX$($F%3%_%C%H$7$?$J$i!"(B
379 \hgcmd{log}$B!"(B\hgcmd{tip} $B$d$=$l$KN`$9$k=PNO$r;}$D%3%^%s%I$N=PNO$K!"(B
380 $B?7$?$J%V%i%s%AL>$,I=<($5$l$F$$$k$3$H$G$7$g$&!#(B
382 \interaction{branch-named.commit}
384 \hgcmd{log} $B$KN`$9$k%3%^%s%I$O!"(B
385 \texttt{default} $B%V%i%s%A0J30$KB0$9$kA4$F$N%A%'%s%8%;%C%H$KBP$7$F!"(B
386 $B%V%i%s%AL>$rI=<($7$^$9!#(B
387 $B$=$N$?$a!"L>A0IU$-%V%i%s%A$r;H$o$J$$8B$j!"(B
388 $B%V%i%s%A$K4X$9$k>pJs$r8+$k$3$H$O$"$j$^$;$s!#(B
390 $BL>A0IU$-%V%i%s%A$r:n@.$7!"$=$N%V%i%s%AL>$GJQ99$r%3%_%C%H$7$?$J$i$P!"(B
391 $B$=$NJQ99$KO"$J$k$=$N8e$N%3%_%C%H$O!"F1$8%V%i%s%AL>$r0z$-7Q$.$^$9!#(B
392 \hgcmd{branch} $B%3%^%s%I$K$h$j!"(B
393 $BG$0U$N;~E@$G%V%i%s%AL>$rJQ99$9$k$3$H$,$G$-$^$9!#(B
395 \interaction{branch-named.rebranch}
397 $B%V%i%s%AL>$O$+$J$jD9$$<wL?$r;}$D$?$a!"(B
398 $B<B:]$K$O$3$N$h$&$J%V%i%s%AL>$NJQ99$O$=$l$[$IIQHK$K<B9T$9$k$3$H$OL5$$$G$7$g$&(B
399 $B!J$3$N$3$H$O5,Ls$G$O$J$/!"$"$/$^$G46A[$G$9!K!#(B
401 \section{Dealing with multiple named branches in a repository}
403 $B%j%]%8%H%j$KJ#?t$NL>A0IU$-%V%i%s%A$,$"$k>l9g!"(B
404 \hgcmd{update} $B$d(B \hgcmdargs{pull}{-u} $B$H$$$C$?%3%^%s%I<B9T$N:]$K!"(B
405 Mercurial $B$O:n6HNN0h%G%#%l%/%H%j$,B0$9$k%V%i%s%A$r3P$($F$$$F!"(B
406 ``$B%j%]%8%H%jA4BN(B''$B$N(B tip $B%j%S%8%g%s$G$O$J$/!"(B
407 $B$=$N%V%i%s%A$N(B tip $B%j%S%8%g%s$G:n6HNN0h%G%#%l%/%H%j$r99?7$7$^$9!#(B
408 $BJL$JL>A0IU$-%V%i%s%A$N%j%S%8%g%s$G99?7$7$?$$>l9g$O!"(B
409 \hgcmd{update} $B%3%^%s%I$K(B
410 \hgopt{update}{-C} $B%*%W%7%g%s$r;XDj$7$J$1$l$P$J$j$^$;$s!#(B
412 $B$3$N?6$kIq$$$O>/!9HyL/$G$9$+$i!"<BNc$G8+$F$_$^$7$g$&!#(B
413 $B;O$a$K!"(B
414 $B$I$N%V%i%s%A>e$G:n6H$7$F$$$k$N$+$H!"(B
415 $B$I$s$J%V%i%s%A$,%j%]%8%H%jCf$KM-$k$N$+$r3NG'$7$^$9!#(B
417 \interaction{branch-named.parents}
419 $B8=:_(B \texttt{bar} $B%V%i%s%A>e$K$$$^$9$,!"(B
420 $B8E$$(B \hgcmd{foo} $B%V%i%s%A$bB8:_$7$^$9!#(B
422 \texttt{foo} $B%V%i%s%A$*$h$S(B \texttt{bar} $B%V%i%s%A$N(B
423 tip $B%j%S%8%g%s$X$N0\F0$O!"(B
424 $BJQ99MzNr>e$rD>@~E*$KA08e$9$k$3$H$7$+I,MW$H$7$J$$$?$a!"(B
425 \hgcmd{update} $B%3%^%s%I$K(B
426 \hgopt{update}{-C} $B%*%W%7%g%s$r;XDj$9$k$3$HL5$7$K!"(B
427 $B$=$l$>$l$N(B tip $B%j%S%8%g%s$X$N99?7$r9T$&$3$H$,$G$-$^$9!#(B
429 \interaction{branch-named.update-switchy}
431 \texttt{foo} $B%V%i%s%A$KLa$k$?$a$K(B
432 \hgcmd{update} $B%3%^%s%I$r<B9T$9$k$H!"(B
433 \texttt{foo} $B%V%i%s%A>e$KN1$^$C$?$^$^$G(B
434 \texttt{bar} $B%V%i%s%A$N(B tip $B%j%S%8%g%s$K$O0\F0$7$^$;$s!#(B
436 \interaction{branch-named.update-nothing}
438 \texttt{foo} $B%V%i%s%A$G$NJQ99$N%3%_%C%H$K$h$j!"(B
439 $B?7$?$J%X%C%I$,@8@.$5$l$^$9!#(B
441 \interaction{branch-named.foo-commit}
443 \texttt{foo} $B%V%i%s%A$+$i(B \texttt{bar} $B%V%i%s%A$X$N99?7$O!"(B
444 $BMzNr$r(B``$B2#$CHt$S(B''$B$7$J$$$H$G$-$^$;$s$+$i!"(B
445 Mercurial $B$O(B
446 \hgcmd{update} $B%3%^%s%I$X$N(B \hgopt{update}{-C}
447 $B%*%W%7%g%s$N;XDj$rI,MW$H$7$^$9!#(B
449 \interaction{branch-named.update-bar}
451 \section{Branch names and merging}
453 $B$*5$$E$-$N;v$H$O;W$$$^$9$,!"(B
454 Mercurial $B$K$*$1$k%^!<%8=hM}$OBP>NE*$G$O$"$j$^$;$s!#(B
455 $B%j%S%8%g%sHV9f(B 17 $B$N$b$N$H(B 23 $B$N$b$N!"(B
456 $B#2$D$N%X%C%I$r%j%]%8%H%j$,;}$C$F$$$k$b$N$H$7$^$7$g$&!#(B
457 $B%j%S%8%g%s(B 17 $B$X$H(B \hgcmd{update}
458 $B$7$F$+$i%j%S%8%g%s(B 23 $B$H(B \hgcmd{merge} $B$7$?>l9g!"(B
459 Mercurial $B$O%j%S%8%g%s(B 17 $B$r%^!<%8$NBh#1?F!"(B
460 $B%j%S%8%g%s(B 23 $B$rBh#2?F$H$7$F5-O?$7$^$9!#(B
461 $B0lJ}$G!"(B
462 $B%j%S%8%g%s(B 23 $B$X$H(B \hgcmd{update}
463 $B$7$F$+$i%j%S%8%g%s(B 17 $B$H(B \hgcmd{merge} $B$7$?>l9g!"(B
464 $B%j%S%8%g%s(B 23 $B$,%^!<%8$NBh#1?F!"(B
465 $B%j%S%8%g%s(B 17 $B$,Bh#2?F$H$7$F5-O?$5$l$^$9!#(B
467 $B$3$N?6$kIq$$$,!"%^!<%8$r9T$C$?:]$N(B Mercurial $B$N%V%i%s%AL>A*Br$K1F6A$7$^$9!#(B
468 $B%^!<%88e$K$=$N7k2L$r%3%_%C%H$9$k$H!"(B
469 Mercurial $B$OBh#1?F$N%V%i%s%AL>$r0];}$7$h$&$H$7$^$9!#(B
470 $BBh#1?F$N%V%i%s%AL>$,(B \texttt{foo} $B$G!"(B
471 \texttt{bar} $B%V%i%s%A$N%j%S%8%g%s$H%^!<%8$7$?>l9g!"(B
472 $B%^!<%88e$N%V%i%s%AL>$O(B \texttt{foo} $B$N$^$^$H$J$j$^$9!#(B
474 $B%j%]%8%H%jCf$KF1$8%V%i%s%AL>$NJ#?t$N%X%C%I$,B8:_$9$k$3$H$O!"(B
475 $B$=$l$[$IDA$7$$$3$H$G$O$"$j$^$;$s!#(B
476 $BNc$($P!";d$H$"$J$?$,(B \texttt{foo} $B%V%i%s%A$G:n6H$7$F$$$k$H$7$^$9!#(B
477 $BFs?M$,$=$l$>$l0[$J$kJQ99$r%3%_%C%H$7!"(B
478 $B;d$,$"$J$?$NJQ99$r(B pull $B$7$^$7$?!#(B
479 $B$3$N;~E@$G;d$N%j%]%8%H%j$K$O!"(B
480 \texttt{foo} $B%V%i%s%A>e$K#2$D$N%X%C%I$,B8:_$7$^$9!#(B
481 $B%^!<%8$N7k2L!"(B
482 \texttt{foo} $B%V%i%s%A>e$N#2$D$N%X%C%I$O4|BTDL$j#1$D$K$J$j$^$9!#(B
484 $B$7$+$7!";d$,(B \texttt{bar} $B%V%i%s%A$G:n6H$7$F$$$F!"(B
485 \texttt{foo} $B%V%i%s%A$N@.2L$r%^!<%8$7$?>l9g!"(B
486 $B%^!<%8$N7k2L$O(B \texttt{bar} $B%V%i%s%A>e$KN1$^$j$^$9!#(B
488 \interaction{branch-named.merge}
490 $B$h$j6qBNE*$JNc$H$7$F!"(B
491 \texttt{bleeding-edge} $B%V%i%s%A$G:n6H$7$F$$$F!"(B
492 $B:G?7$N@.2L$r(B \texttt{stable} $B%V%i%s%A$+$i;}$A9~$_$?$$$H;W$C$?$H$7$^$9!#(B
493 $B$3$N>l9g!"(B
494 \texttt{stable} $B%V%i%s%A$N@.2L$r(B pull $B$7$F%^!<%8$7$?CJ3,$G!"(B
495 Mercurial $B$O(B``$BE,@Z$J(B''$B%V%i%s%AL>(B(\texttt{bleeding-edge})$B$rA*Br$7$^$9!#(B
497 \section{Branch naming is generally useful}
499 $B<wL?$ND9$$J#?t$N%V%i%s%A$,C10l%j%]%8%H%j$G6&B8$7$F$$$k>u67$@$1$,!"(B
500 $BL>A0IU$-%V%i%s%A$NMxMQ$G$-$k>u67$@$H$O9M$($J$$$G$/$@$5$$!#(B
501 $B%j%]%8%H%j#1$D$K%V%i%s%A#1$D$N>u67$G$"$C$F$b!"(B
502 $BL>A0IU$-%V%i%s%A$OM-MQ$G$9!#(B
504 $BC1=c$JNc$H$7$F$O!"(B
505 $B%V%i%s%A$KL>A0$rIUM?$9$k$3$H$G!"(B
506 $B%A%'%s%8%;%C%H$,$I$N%V%i%s%A$KM3Mh$9$k$+$N915WE*$J5-O?$rF@$k$3$H$,$G$-$^$9!#(B
507 $B$3$N5-O?$O!"(B
508 $B<wL?$ND9$$%V%i%s%A$r;}$D%W%m%8%'%/%H$NMzNr$rC)$k:]$K!"(B
509 $BB?$/$N>pJs$r$b$?$i$9$3$H$G$7$g$&!#(B
511 $B%j%]%8%H%j$r6&M-$7$F:n6H$7$F$$$k>l9g!"(B
512 \hook{pretxnchangegroup} $B%U%C%/$r$=$l$>$l$N%j%]%8%H%j$KBP$7$F@_Dj$9$k$3$H$G!"(B
513 ``$BIT@5$J(B''$B%V%i%s%AL>$r;}$DJQ99$,;}$A9~$^$l$k$N$rKI$0$3$H$,$G$-$^$9!#(B
514 $B$3$N<jK!$OC1=c$G$9$,!"(B
515 ``$B7l$NE)$k?O(B''$B$H$G$b8@$&$Y$-!JIT0BDj$J!K%V%i%s%A$N@.2L$r!"(B
516 $B8m$C$F(B``$B0BDj$7$?(B''$B%V%i%s%A$X$H;}$A9~$`$3$H$rKI$0$K$O8z2LE*$G$9!#(B
517 $B$3$N$h$&$J%U%C%/$O!"(B
518 $B6&M-%j%]%8%H%j$N(B \hgrc $B%U%!%$%k$K0J2<$N$h$&$K5-=R$7$^$9!#(B
520 \begin{codesample2}
521 [hooks]
522 pretxnchangegroup.branch = hg heads --template '{branches} ' | grep mybranch
523 \end{codesample2}
525 %%% Local Variables:
526 %%% mode: latex
527 %%% TeX-master: "00book"
528 %%% End: