<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
foozy@708: \chapter{Managing releases and branchy development}
foozy@708: \label{chap:branch}
foozy@708: 
foozy@708: Mercurial $B$O!"(B
foozy@708: $BF1;~JB9TE*$K3+H/$r?J$a$k$h$&amp;$J%W%m%8%'%/%H$r4IM}$G$-$k;EAH$_$r;}$C$F$$$^$9!#(B
foozy@708: $B$3$l$i$N;EAH$_$rM}2r$9$k$?$a$K!"(B
foozy@708: $B$^$:$O0lHLE*$J%=%U%H%&amp;%'%"3+H/$N;EAH$_$rD/$a$F$_$^$7$g$&amp;!#(B
foozy@708: 
foozy@708: $BB?$/$N%=%U%H%&amp;%'%"%W%m%8%'%/%H$G$O!"(B
foozy@708: $B=EMW$J?75,5!G=$r4^$`(B``$B%a%8%c!&lt;(B''$B%j%j!&lt;%9$r4V7gE*$KH/9T$7$^$9!#(B
foozy@708: $B$=$l$HJ?9T$7$F(B``$B%^%$%J!&lt;(B''$B%j%j!&lt;%9$bH/9T$9$k$3$H$,$"$j$^$9!#(B
foozy@708: $BB?$/$N&gt;l9g!"(B
foozy@708: $B%^%$%J!&lt;%j%j!&lt;%9$O85$K$7$?%a%8%c!&lt;%j%j!&lt;%9$HF10l$G$9$,!"(B
foozy@708: $B%P%0$N=$@5$,$J$5$l$F$$$^$9!#(B
foozy@708: 
foozy@708: $B$3$N&gt;O$G$O!"(B
foozy@708: $B!V%j%j!&lt;%9!W$N$h$&amp;$J%W%m%8%'%/%H$N%^%$%k%9%H!&lt;%s$N!"(B
foozy@708: $B5-O?$rJ];}$9$kJ}K!$+$i@bL@$r;O$a$?$$$H;W$$$^$9!#(B
foozy@708: $B$=$N8e$G!"(B
foozy@708: $B%W%m%8%'%/%H$K$*$1$k%U%'!&lt;%:0\9T$G$N:n6H$NN.$l$d!"(B
foozy@708: $B$=$N:]$N:n6H$d@.2LJ*$r(B
foozy@708: Mercurial $B$K$h$C$FJ,N%!?4IM}$9$kJ}K!$r@bL@$7$^$9!#(B
foozy@708: 
foozy@708: \section{Giving a persistent name to a revision}
foozy@708: 
foozy@708: $BFCDj$N%j%S%8%g%s$r(B``$B%j%j!&lt;%9(B''$B$H8F$V$3$H$K7hDj$7$?$J$i!"(B
foozy@708: $B$=$N%j%S%8%g%s$N(B ID $B$r5-O?$9$k$Y$-$G$9!#(B
foozy@708: $B%j%S%8%g%s$N(B ID $B$r5-O?$9$k$3$H$G!"(B
foozy@708: $B8eF|2?$i$+$NM}M3!JNc$($P%P%0$N:F8=$d!"?75,%W%i%C%H%U%)!&lt;%`$X$N0\?"Ey!K(B
foozy@708: $B$GI,MW$K$J$C$?:]$K%j%j!&lt;%9$r:F8=$9$k$3$H$,$G$-$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.init}
foozy@708: 
foozy@708: \hgcmd{tag} $B%3%^%s%I$rMxMQ$9$k$3$H$G!"(B
foozy@708: Mercurial $B$OG$0U$N%j%S%8%g%s$K1JB3E*$JL&gt;A0$rIUM?$7$^$9!#(B
foozy@708: $BFI&lt;T$NM=A[DL$j!"$3$NL&gt;A0$N$3$H$r(B``$B%?%0(B''$B$H8F$S$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.tag}
foozy@708: 
foozy@708: $B%j%S%8%g%s$K$H$C$F!"(B
foozy@708: $B%?%0$O(B``$B&gt;]D'E*$JL&gt;A0(B''(symbolic name) $B0J30$N2?&lt;T$G$b$"$j$^$;$s!#(B
foozy@708: $B%?%0$O=c?h$KMxJX@-$N$?$a$KB8:_$9$k$b$N$G!"(B
foozy@708: $B%j%S%8%g%s$r;2&gt;H$9$k:]$N&lt;j7Z$G1JB3E*$J&lt;jCJ$H$J$j$^$9!#(B
foozy@708: Mercurial $B$O!"(B
foozy@708: $BMxMQ&lt;T$NMQ$$$k%?%0L&gt;$N0UL#$r2r&lt;a$7$?$j$7$^$;$s!#(B
foozy@708: $B[#Kf$5$,L5$/2r@O$G$-$k$3$H$rJ]&gt;Z$9$k$?$a$KI,MW$J&gt;/!9$N@)Ls$r=|$$$F$O!"(B
foozy@708: $B%?%0L&gt;$K2?$i$+$N@)Ls$r$D$1$?$j$9$k$3$H$b$"$j$^$;$s!#(B
foozy@708: $B0J2&lt;$N$$$:$l$NJ8;z$b%?%0L&gt;$K$O;HMQ$G$-$^$;$s!#(B
foozy@708: 
foozy@708: \begin{itemize}
foozy@708: \item $B%3%m%s(B(ASCII 58, ``\texttt{:}'')
foozy@708: \item $B9TF,0\F0(B\footnote{carriage return} (ASCII 13, ``\Verb+\r+'')
foozy@708: \item $B2~9T(B (ASCII 10, ``\Verb+\n+'')
foozy@708: \end{itemize}
foozy@708: 
foozy@708: \hgcmd{tags} $B%3%^%s%I$r;HMQ$9$k$3$H$G!"(B
foozy@708: $B%j%]%8%H%j$,J];}$7$F$$$k%?%0$rI=&lt;($5$;$k$3$H$,$G$-$^$9!#(B
foozy@708: \hgcmd{tags} $B%3%^%s%I$N=PNO$K$*$$$F!"(B
foozy@708: $B8D!9$N%?%0IU$1$5$l$?%j%S%8%g%s$O!"(B
foozy@708: $B;O$a$K%?%0L&gt;$G!"&lt;!$K%j%S%8%g%sHV9f$G!"(B
foozy@708: $B:G8e$K0l0U$N%j%S%8%g%s%O%C%7%eCM$G&lt;1JL$5$l$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.tags}
foozy@708: 
foozy@708: \texttt{tip} $B%?%0$,(B \hgcmd{tags} 
foozy@708: $B%3%^%s%I$N=PNO$KNs5s$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B
foozy@708: \texttt{tip} $B$O!"&gt;o$K%j%]%8%H%jCf$N:G?7$N%j%S%8%g%s$r;X$9(B
foozy@708: ``$BN.F0E*$J(B''$BFC&lt;l%?%0$G$9!#(B
foozy@708: 
foozy@708: \hgcmd{tags} $B%3%^%s%I$N=PNO$G$O!"(B
foozy@708: $B%?%0$O%j%S%8%g%sHV9f$N5U=g!J9_=g!K$GNs5s$5$l$F$$$^$9!#(B
foozy@708: $B$3$l$O:G?7$N%?%0$O8E$$%?%0$h$j$b@h$KNs5s$5$l$k$3$H$r0UL#$7!"(B
foozy@708: $B$=$l$OF1;~$K(B \hgcmd{tags} $B$,=PNO$9$k%?%00lMw$N:G=i$K(B
foozy@708: \texttt{tip} $B$,I=&lt;($5$l$k$3$H$b0UL#$7$^$9!#(B
foozy@708: 
foozy@708: \hgcmd{log} $B%3%^%s%I$N&lt;B9T;~$K!"(B
foozy@708: $B%?%0$H4XO"IU$1$i$l$?%j%S%8%g%s$rI=&lt;($9$k&gt;l9g!"(B
foozy@708: \hgcmd{log} $B%3%^%s%I$O%?%0$rI=&lt;($7$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.log}
foozy@708: 
foozy@708: Mercurial $B%3%^%s%I$KBP$7$F%j%S%8%g%s&lt;1JL;R$r;XDj$9$kI,MW$,$"$k&gt;l9g!"(B
foozy@708: $B%j%S%8%g%s&lt;1JL;R$r;XDj$9$k0LCV$G$O!"(B
foozy@708: $B&gt;o$K%?%0L&gt;$r;HMQ$9$k$3$H$,$G$-$^$9!#(B
foozy@708: Mercurial $B$NFbIt$G$O!"(B
foozy@708: $B%?%0L&gt;$rBP1~$9$k%j%S%8%g%s&lt;1JL;R$KJQ49$7$F$+$i;HMQ$7$F$$$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.log.v1.0}
foozy@708: 
foozy@708: $BC10l$N%j%]%8%H%j$,J];}$G$-$k%?%0$N?t$K$b!"(B
foozy@708: $BC10l$N%j%S%8%g%s$KIUM?$G$-$k%?%0$N?t$K$b@)8B$O$"$j$^$;$s!#(B
foozy@708: $B8=&lt;BE*$JLdBj$H$7$F!"(B
foozy@708: $B%?%0$OC1$K%j%S%8%g%s$NFCDj$rJd=u$9$k$b$N$G$9$+$i!"(B
foozy@708: ``$B2a&gt;j$K(B''$B!J6qBNE*$J?t$O%W%m%8%'%/%H$K1~$8$F0[$J$j$^$9$,!K(B
foozy@708: $B%?%0$rIUM?$9$k$N$O$h$m$7$/$"$j$^$;$s!#(B
foozy@708: $BB?$/$N%?%0$,$"$k$H!"%j%S%8%g%s$rFCDj$9$kMxJX@-$,Aa!9$K8:&gt;/$7$F$7$^$$$^$9!#(B
foozy@708: 
foozy@708: $BNc$($P!"(B
foozy@708: $B$"$k%W%m%8%'%/%H$G$O?tF|Kh$NIQEY$G%^%$%k%9%H!&lt;%s$r@_Dj$7$F$$$k$H$9$k$H!"(B
foozy@708: $B$=$l$&gt;$l$N%^%$%k%9%H!&lt;%s$K%?%0$rIUM?$9$k$N$O6K$a$F9gM}E*$G$9!#(B
foozy@708: $B$7$+$7!"A4$F$N%j%S%8%g%s$G3N&lt;B$Ke:No$J%S%k%I$,$G$-$k7QB3E*(B
foozy@708: $B!J(Bcontinuous$B!K$J%S%k%I%7%9%F%`$,$"$k&gt;l9g$O!"(B
foozy@708: $Be:No$J%S%k%IKh$K%?%0$rIUM?$9$k$H!"BgNL$N%N%$%:$r;}$A9~$`$3$H$K$J$j$^$9!#(B
foozy@708: $B$=$NBe$o$j$K!"(B
foozy@708: $B%S%k%I$,&lt;:GT$9$k%j%S%8%g%s!J$3$N;vBV$,5)$@$H2&gt;Dj$7$F$$$^$9!*!K(B
foozy@708: $B$K%?%0$rIUM?$9$k$+!"(B
foozy@708: $B%S%k%I$N2DH]$rDI@W$9$k%?%0$N;HMQ$r;_$a$k$N$,NI$$$G$7$g$&amp;!#(B
foozy@708: 
foozy@708: $BI,MW$NL5$/$J$C$?%?%0$r:o=|$7$?$$&gt;l9g$O(B
foozy@708: \hgcmdargs{tag}{--remove} $B%3%^%s%I$r;HMQ$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.remove}
foozy@708: 
foozy@708: $BG$0U$N;~E@$G%?%0$N4XO"IU$1$rJQ99$9$k$3$H$b$G$-$^$9$N$G!"(B
foozy@708: $B?75,$N(B \hgcmd{tag} $B%3%^%s%I&lt;B9T$K$h$j!"(B
foozy@708: $BF10l$N%?%0$,0[$J$k%j%S%8%g%s$r&lt;1JL$9$k$h$&amp;$K$J$j$^$9!#(B
foozy@708: \emph{$BK\Ev$K(B}$B%?%0$r99?7$7$?$$$3$H$r(B Mercurial $B$KEA$($k$?$a$K!"(B
foozy@708: \hgopt{tag}{-f} $B%*%W%7%g%s$r;HMQ$7$J$1$l$P$J$j$^$;$s!#(B
foozy@708: 
foozy@708: \interaction{tag.replace}
foozy@708: 
foozy@708: $B%?%0$N99?78e$b!"(B
foozy@708: $B%?%0$,0JA0$K&lt;1JL$7$F$$$?%j%S%8%g%s$K4X$9$k1JB3E*$J5-O?$,;D$j$^$9$,!"(B
foozy@708: Mercurial $B$,$=$l$r;HMQ$9$k$3$H$O$"$j$^$;$s!#(B
foozy@708: $B$3$N$h$&amp;$K!"(B
foozy@708: $B4V0c$C$?%j%S%8%g%s$X$N%?%0$NIUM?$K$O2?$NITMx1W$b$"$j$^$;$s$N$G!"(B
foozy@708: $B%?%0IU$1$r4V0c$C$?$J$i!"@5$7$$%j%S%8%g%s$K%?%0$rIUM?$7D&gt;$;$P$h$$$N$G$9!#(B
foozy@708: 
foozy@708: Mercurial $B$O!"(B
foozy@708: $B%j%]%8%H%jCf$N%j%S%8%g%s4IM}$5$l$?DL&gt;o%U%!%$%k$K%?%0$N&gt;pJs$r3JG&lt;$7$F$$$^$9!#(B
foozy@708: $B2?$i$+$N%?%0$rIUM?$9$k$H!"(B
foozy@708: \sfilename{.hgtags} $B%U%!%$%kCf$K$=$N%?%0$r8+$D$1$k$3$H$,$G$-$k$G$7$g$&amp;!#(B
foozy@708: \hgcmd{tag} $B%3%^%s%I$r&lt;B9T$9$k$H!"(B
foozy@708: Mercurial $B$O$3$N%U%!%$%k$rJQ99$7!"&lt;+F0E*$KJQ99$r%3%_%C%H$7$^$9!#(B
foozy@708: $B$3$N$3$H$O!"(B
foozy@708: \hgcmd{tag} $B%3%^%s%I$r&lt;B9T$7$?:]$K$O!"(B
foozy@708: $B&gt;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
foozy@708: $B$H$$$&amp;$3$H$r0UL#$7$F$$$^$9!#(B
foozy@708: 
foozy@708: \interaction{tag.tip}
foozy@708: 
foozy@708: \subsection{Handling tag conflicts during a merge}
foozy@708: 
foozy@708: \sfilename{.hgtags} $B%U%!%$%k$r5$$K$9$kI,MW$OKX$I$"$j$^$;$s$,!"(B
foozy@708: $B;~$K$O%^!&lt;%8$N:]$K$=$NB8:_$,0U&lt;1$5$l$k$3$H$,$"$j$^$9!#(B
foozy@708: $B$3$N%U%!%$%k$N7A&lt;0$OC1=c$G!"O"B3$7$?9T$+$i9=@.$5$l$F$$$^$9!#(B
foozy@708: $B3F9T$O%A%'%s%8%;%C%H$N%O%C%7%eCM$G;O$^$j!"6uGr$H%?%0L&gt;$,B3$-$^$9!#(B
foozy@708: 
foozy@708: $B%^!&lt;%8$K$*$1$k(B
foozy@708: \sfilename{.hgtags} $B%U%!%$%k$N&gt;WFM$r2r&gt;C$9$k:]$K$O!"(B
foozy@708: \sfilename{.hgtags} $B%U%!%$%k=$@5$K$R$M$j$,I,MW$G$9!#(B
foozy@708: $B%j%]%8%H%jCf$N%?%0$r2r@O$9$k&gt;l9g!"(B
foozy@708: Mercurial $B$O(B\emph{$B7h$7$F(B} 
foozy@708: \sfilename{.hgtags} $B%U%!%$%k$N%o!&lt;%-%s%0%3%T!&lt;$r;2&gt;H$9$k$3$H$O$"$j$^$;$s!#(B
foozy@708: $B$=$NBe$o$j$K!"(BMercurial 
foozy@708: $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
foozy@708: 
foozy@708: $B$3$N$h$&amp;$J@_7W$N;DG0$J7k2L$H$7$F!"(B
foozy@708: $B%^!&lt;%8$7$?(B \sfilename{.hgtags} $B%U%!%$%k$,!"(B
foozy@708: $B$=$NJQ99$r%3%_%C%H$7$?(B\emph{$B8e$b(B}$B@5$7$$&gt;uBV$G$"$k$3$H$r!"(B
foozy@708: $B&lt;B:]$K8!&gt;Z$9$k$3$H$,$G$-$^$;$s!#(B
foozy@708: $B%^!&lt;%8$N:]$K(B \sfilename{.hgtags} $B%U%!%$%k$N&gt;WFM$r2r&gt;C$9$k:]$K$O!"(B
foozy@708: $B%3%_%C%H8e$K(B \hgcmd{tags} $B%3%^%s%I$N&lt;B9T$rK:$l$:$K9T$C$F$/$@$5$$!#(B
foozy@708: \sfilename{.hgtags} $B%U%!%$%k$KIT@5$,$"$C$?&gt;l9g!"(B
foozy@708: \hgcmd{tags} $B%3%^%s%I$OIT@5$N&gt;l=j$rJs9p$7$^$9$N$G!"(B
foozy@708: $B$=$N2U=j$r=$@5$7$F%3%_%C%H$9$l$PNI$$$N$G$9!#(B
foozy@708: $BJQ99FbMF$N@5$7$5$r3NG'$9$k$?$a$K!"(B
foozy@708: $BJQ99$N8e$G!":FEY(B \hgcmd{tags} $B%3%^%s%I$r&lt;B9T$7$F$/$@$5$$!#(B
foozy@708: 
foozy@708: \subsection{Tags and cloning}
foozy@708: 
foozy@708: \hgcmd{clone} $B%3%^%s%I$,(B
foozy@708: $BFCDj$N%A%'%s%8%;%C%H$r;XDj$7$F87L)$JJ#@=$r:n@.$9$k$?$a$N(B
foozy@708: \hgopt{clone}{-r} $B%*%W%7%g%s$r;}$C$F$$$k$3$H$K5$IU$$$F$$$k$+$b$7$l$^$;$s!#(B
foozy@708: $B?7$7$$J#@=$O!"(B
foozy@708: $B;XDj$7$?%j%S%8%g%s$h$j$b8e$K@8$8$?MzNr&gt;pJs$r0l@Z;}$C$F$$$^$;$s!#(B
foozy@708: $B$3$N$3$H$,%?%0$HAj8_:nMQ$7$?&gt;l9g!"!"(B
foozy@708: $BL}CG$7$F$$$k$H6C$+$5$l$k;vBV$K$J$j$^$9!#(B
foozy@708: 
foozy@708: $B%?%0$N@8@.$,!"(B
foozy@708: \sfilename{.hgtags} $B%U%!%$%k$X$N3JG&lt;$N:]$K!"(B
foozy@708: $B0l$D$N%j%S%8%g%s$H$7$F07$o$l$k$3$H$r;W$$=P$;$P!"(B
foozy@708: $B%?%0$,5-O?$5$l$?%A%'%s%8%;%C%H$,!"(B
foozy@708: $B%?%0$NIUM?BP&gt;]$H$J$k!J8E$$!K%A%'%s%8%;%C%H$r;2&gt;H$9$k$N$OEvA3$N$3$H$G$9!#(B
foozy@708: $B%?%0(B \texttt{foo} $B;~E@$N%j%]%8%H%j$rJ#@=$9$k$?$a$K(B
foozy@708: \hgcmdargs{clone}{-r foo}  $B$r&lt;B9T$7$?&gt;l9g!"(B
foozy@708: $BJ#@=$5$l$?%j%]%8%H%j$O!"(B
foozy@708: $BJ#@=$9$k:]$K;HMQ$5$l$?(B\emph{$B%?%0$N:n@.$K4X$9$kMzNr$r;}$C$F$$$^$;$s(B}$B!#(B
foozy@708: $B?7$7$$%j%]%8%H%j$K$O!"(B
foozy@708: $B%W%m%8%'%/%HMzNr$N40A4$J%5%V%;%C%H$,4^$^$l$^$9$,!"(B
foozy@708: $BM#0l!";XDj$KMQ$$$?%?%0$N&gt;pJs$O(B\emph{$B4^$^$l$F$$$^$;$s(B}$B!#(B
foozy@708: 
foozy@708: \subsection{When permanent tags are too much}
foozy@708: 
foozy@708: Mercurial $B$N%?%0$O9=@.4IM}$5$l$F$*$j!"(B
foozy@708: $B%W%m%8%'%/%H$NMzNr$H0lBN2=$7$F$$$k$?$a!"(B
foozy@708: $BC/$+$,:n@.$7$?%?%0$O!"(B
foozy@708: $B0l=o$K:n6H$r9T$C$F$$$kC/$b$,8+$k$3$H$,$G$-$^$9!#(B
foozy@708: $B$7$+$7!"%j%S%8%g%s$KL&gt;A0$rIU$1$k$3$H$O!"(B
foozy@708: $B%j%S%8%g%s(B \texttt{4237e45506ee} $B$,&lt;B$O(B \texttt{v2.0.2}  $B$G$"$k!"(B
foozy@708: $B$H$$$&amp;$3$H$r=q$-N1$a$F$*$/0J&gt;e$NM-MQ@-$,$"$j$^$9!#(B
foozy@708: $B9*L/$J%P%0$rDI@W$9$k:]$K!"(B
foozy@708: ``$B%"%s$,$3$N%j%S%8%g%s$G&gt;I&gt;u$r8+$+$1$?(B''$B$H$$$C$?N`$NHwK:O?$H$7$F!"(B
foozy@708: $B%?%0$rIUM?$7$?$$&gt;l9g$b$"$k$G$7$g$&amp;!#(B
foozy@708: 
foozy@708: $B$3$N$h$&amp;$J&gt;l9g!"(B
foozy@708: \emph{$B%m!&lt;%+%k(B}$B$J%?%0$,:GE,$G$9!#(B
foozy@708: \hgopt{tag}{-l} $B%*%W%7%g%sIU$-$G(B
foozy@708: \hgcmd{tag} $B%3%^%s%I$r5/F0$9$k$3$H$G!"(B
foozy@708: $B%m!&lt;%+%k%?%0$r:n@.$9$k$3$H$,$G$-$^$9!#(B
foozy@708: $B$3$N%3%^%s%I&lt;B9T$N&gt;l9g!"(B
foozy@708: $B%?%0$O(B \sfilename{.hg/localtags} $B%U%!%$%k$K3JG&lt;$5$l$^$9(B
foozy@708: \sfilename{.hgtags} $B$H0[$J$j(B
foozy@708: \sfilename{.hg/localtags} $B$O9=@.4IM}$5$l$^$;$s!#(B
foozy@708: \hgopt{tag}{-l} $B$K$h$C$F:n@.$7$?%?%0$O!"(B
foozy@708: $B8=:_:n6H$r$7$F$$$k%j%]%8%H%j$KN1$^$jB3$1$^$9(B
foozy@708: \footnote{$BLuCm(B: \hgcmd{clone}$B!"(B\hgcmd{pull} $B$d(B 
foozy@708: \hgcmd{push} $B$K$h$C$FB&gt;$N%j%]%8%H%j$K%3%T!&lt;$5$l$k$3$H$,$"$j$^$;$s(B}$B!#(B
foozy@708: 
foozy@708: \section{The flow of changes---big picture vs. little}
foozy@708: 
foozy@708: $B$3$3$G!"K\&gt;O$NKAF,$G=R$Y$?35N,$KLa$j!"(B
foozy@708: $BJ#?t$NJ?9T$7$?3+H/$,F1;~$K9T$o$l$F$$$k%W%m%8%'%/%H$K$D$$$F9M$($F8+$^$7$g$&amp;!#(B
foozy@708: 
foozy@708: $B?7$7$$(B``$B&lt;g(B''$B%j%j!&lt;%9$d!"(B
foozy@708: $B:G?7$N&lt;g%j%j!&lt;%9$KBP$9$k?7$?$J%^%$%J!&lt;%P%0=$@5!"(B
foozy@708: $B8=:_$OJ]&lt;i&gt;uBV$K$"$k$h$&amp;$J8E$$%j%j!&lt;%9$KBP$9$kM=4|$;$L(B``hot fix''
foozy@708: $B$N$?$a$N(B push $B$,$"$k$G$7$g$&amp;!#(B
foozy@708: 
foozy@708: $B3+H/$K$*$1$kMM!9$JJ?9T$7$?J}8~$r;2&gt;H$9$k$?$a$N0lHLE*$JJ}K!$O!"(B
foozy@708: ``$B%V%i%s%A(B''$B$H8F$P$l$k$b$N$G$9!#(B
foozy@708: $B$7$+$7!"(B
foozy@708: Mercurial $B$,(B\emph{$BA4$F$NMzNr(B}$B$r(B
foozy@708: $B!V%V%i%s%A$H%^!&lt;%8$NO"B3!W$H$7$F07$C$F$$$k$3$H$r!"(B
foozy@708: $B4{$K2?EY$b8+$F$-$^$7$?!#(B
foozy@708: $B&lt;B:]$K$O!"(B
foozy@708: $BI=LLE*$K$O4X78$7$F$$$k$h$&amp;$G!"(B
foozy@708: $B$=$N&lt;B!"$?$^$?$^F1$8L&gt;A0$G$"$k$@$1$N#2$D$N35G0$r07$C$F$$$k$N$G$9!#(B
foozy@708: 
foozy@708: \begin{itemize}
foozy@708: \item ``$B5p;kE*$J(B''$B%V%i%s%A$O!"%W%m%8%'%/%HH/E8$N9-$,$j$rI=$7!"(B
foozy@708:   $BL&gt;A0$r$D$1$?$j!"OCBj$K&gt;e$C$?$j$7$^$9!#(B
foozy@708: 
foozy@708: \item ``$BHy;kE*$J(B''$B%V%i%s%A$O!"F|!9$N3+H/3hF0$H!"JQ99%^!&lt;%8$N@.2L$G$9!#(B
foozy@708:   $B$3$N%V%i%s%A$O!"%3!&lt;%I$,$I$N$h$&amp;$K3+H/$5$l$F$$$C$?$N$+$rJ*8l$j$^$9!#(B
foozy@708: 
foozy@708: \end{itemize}
foozy@708: 
foozy@708: \section{Managing big-picture branches in repositories}
foozy@708: 
foozy@708: Mercurial $B$K$*$$$F(B``$B5p;kE*$J(B''$B%V%i%s%A$r3VN%$9$k:G$b4JC1$JJ}K!$O!"(B
foozy@708: $B3VN%MQ$N%j%]%8%H%j$rMQ0U$9$k$3$H$G$9!#(B
foozy@708: $BNc$($P!"4{$K$"$k6&amp;M-%j%]%8%H%j(B---$B$3$l$r(B \texttt{myproject} $B$H8F&gt;N$7$^$9(B
foozy@708: ---$B$,(B ``1.0'' $B$H$$$&amp;%^%$%k%9%H!&lt;%s$KE~C#$7$F$$$k&gt;l9g!"(B
foozy@708: 1.0 $B%j%j!&lt;%9$N$?$a$K;HMQ$7$?%j%S%8%g%s$K%?%0$rIUM?$9$k$3$H$G!"(B
foozy@708: 1.0 $BHG$KBP$9$kMh$k$Y$-J]&lt;i%j%j!&lt;%9$N=`Hw$r9T$$$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.tag}
foozy@708: 
foozy@708: $B%?%0IU$1$7$?;~E@$HF1$8FbMF$N(B
foozy@708: \texttt{myproject-1.0.1} 
foozy@708: $B$H$$$&amp;L&gt;$N?7$7$$6&amp;M-%j%]%8%H%j$rJ#@=$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.clone}
foozy@708: 
foozy@708: $B$=$N8e!"(B
foozy@708: $BMh$k(B 1.0.1 $B%^%$%J!&lt;%j%j!&lt;%9$K4^$a$k$Y$-%P%0=$@5$N:n6H$,I,MW$K$J$C$?$J$i!"(B
foozy@708: \texttt{myproject-1.0.1} $B%j%]%8%H%j$rJ#@=$7JQ99$r9T$C$F!"(B
foozy@708: $B$=$N@.2L$rH?1G$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.bugfix}
foozy@708: 
foozy@708: $B$=$N4V!"&lt;!$N%a%8%c!&lt;%j%j!&lt;%9$X8~$1$?3+H/:n6H$O!"(B
foozy@708: $B%^%$%J!&lt;%j%j!&lt;%9$K4X$9$k:n6H$H$O3VN%$5$l$?&gt;uBV$G!"(B
foozy@708: \texttt{myproject} $B%j%]%8%H%j$K$*$$$F3hH/$KB3$1$i$l$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.new}
foozy@708: 
foozy@708: \section{Don't repeat yourself: merging across branches}
foozy@708: 
foozy@708: $BJ]&lt;iMQ%V%i%s%A$G%P%0=$@5$r9T$C$?$H$9$k$H!"(B
foozy@708: $BB?$/$N&gt;l9g!"%W%m%8%'%/%H$N%a%$%s%V%i%s%A$K(B
foozy@708: $B!J$=$7$F$=$l0J30$NJ]&lt;i%V%i%s%A$K$*$$$F$b!K(B
foozy@708: $BF1$8%P%0$,B8:_$9$k2DG=@-$,$"$j$^$9!#(B
foozy@708: $BF1$8%P%0$r2?EY$bD&gt;$7$?$$$H;W$&amp;3+H/&lt;T$O5)$G$9$+$i!"(B
foozy@708: $BF1$8:n6H$r7+$jJV$9$3$H$J$/%P%0=$@5$r4IM}$9$k$?$a$K(B
foozy@708: Mercurial $B$,Ds6!$9$k4v$D$+$NJ}K!$r8+$F$_$^$7$g$&amp;!#(B
foozy@708: 
foozy@708: $B:G$bC1=c$JJ}K!$O!"(B
foozy@708: $B:n6HBP&gt;]%V%i%s%A$+$iJ#@=$7$?%m!&lt;%+%k%j%]%8%H%j$X!"(B
foozy@708: $BJ]&lt;i%V%i%s%A$+$iJQ99$r(B pull $B$9$k$3$H$G$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.pull}
foozy@708: 
foozy@708: $B$=$N&gt;e$G#2$D$N%V%i%s%A$N$=$l$&gt;$l$N%X%C%I$r%^!&lt;%8$7!"(B
foozy@708: $B$=$N@.2L$r%a%$%s%V%i%s%A$KH?1G$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-repo.merge}
foozy@708: 
foozy@708: \section{Naming branches within one repository}
foozy@708: 
foozy@708: $BB?$/$N&gt;l9g$O!"(B
foozy@708: $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
foozy@708: $BC1=c$G$9$+$iM}2r$b4JC1$G$9$7!"$=$l8N$K4V0c$($k$3$H$,$"$j$^$;$s!#(B
foozy@708: $B:n6H$7$F$$$k%V%i%s%A$H!"%3%s%T%e!&lt;%?&gt;e$N!J%j%]%8%H%j!K%G%#%l%/%H%j$N4V$G!"(B
foozy@708: $B#1BP#1$N4X78$,$G$-$F$$$^$9$N$G!"(B
foozy@708: $B%V%i%s%A!?%j%]%8%H%jCf$N%U%!%$%k$KBP$7$F!"(B
foozy@708: $B!J(BMercurial $B$r0U&lt;1$7$J$$!KDL&gt;o$N%D!&lt;%k$r;HMQ$9$k$3$H$b$G$-$^$9!#(B
foozy@708: 
foozy@708: $B$"$J$?$,!J$=$7$F6&amp;F1:n6H&lt;T$b!K(B
foozy@708: ``$B%Q%o!&lt;%f!&lt;%6!&lt;(B''$B$h$j$b9b$$%l%Y%k$K$"$k$N$G$"$l$P!"(B
foozy@708: $B%V%i%s%A(B(that you can consider XXXX)$B$r07$&amp;JL$JJ}K!$,$"$j$^$9!#(B
foozy@708: $BA0$N@a$G$O!"(B
foozy@708: ``$BHy;kE*(B''$B%V%i%s%A$H(B``$B5p;kE*(B''$B%V%i%s%A$N!"(B
foozy@708: $BMxMQ&lt;T%l%Y%k$G$N6hJL$K$D$$$F8@5Z$7$^$7$?!#(B
foozy@708: $BC10l$N%j%]%8%H%jCf$G!"(B
foozy@708: $B&gt;o$KJ#?t$N(B``$BHy;kE*$J(B''$B%V%i%s%A(B
foozy@708: $B!JNc$($P!"JQ99$N(B pull $B8e$K%^!&lt;%8$7$F$$$J$$&gt;uBV!K$r07$C$F$$$k0lJ}$G!"(B
foozy@708: Mercurial $B$OJ#?t$N(B``$B5p;kE*$J(B''$B%V%i%s%A$r07$&amp;$3$H(B\emph{$B$b(B}$B$G$-$^$9!#(B
foozy@708: 
foozy@708: Mercurial $B$,(B``$B5p;kE*$J(B''$B%V%i%s%A$r07$&amp;:]$NMWE@$O!"(B
foozy@708: $B%V%i%s%A$K1JB3E*$J(B\emph{$BL&gt;A0(B}$B$rIU$1$k$H$3$m$K$"$j$^$9!#(B
foozy@708: $BA0=R$N$h$&amp;$K(B \texttt{default} $B$H$$$&amp;L&gt;A0$N%V%i%s%A$,&gt;o$KB8:_$7$^$9$N$G!"(B
foozy@708: $B%V%i%s%A$X$NL?L&gt;$r9T$&amp;A0$G$"$C$F$b!"(B
foozy@708: $BC5$;$P(B \texttt{default} $B%V%i%s%A$N@W$r8+$D$1$k$3$H$,$G$-$^$9!#(B
foozy@708: 
foozy@708: $BNc$($P!"(B
foozy@708: \hgcmd{commit} $B%3%^%s%I$r&lt;B9T$9$k$H!"(B
foozy@708: $B%(%G%#%?$,5/F0$5$l$F%3%_%C%H%a%C%;!&lt;%8$rF~NO$G$-$^$9(B
foozy@708: \footnote{$BLuCm(B: Emacs $B$N(B hg-mode.el $B$r;HMQ$7$F$$$k&gt;l9g$O8+$i$l$^$;$s(B}$B$,!"(B
foozy@708: $BKvHx$N(B ``\texttt{HG: branch default}'' $B$r4^$`9T$r8+$F$/$@$5$$!#(B
foozy@708: $B$3$l$O!"(B\texttt{default} $B$H$$$&amp;L&gt;A0$N%V%i%s%A$KBP$7$F%3%_%C%H$7$F$$$k!"(B
foozy@708: $B$H$$$&amp;$3$H$rI=$7$F$$$^$9!#(B
foozy@708: 
foozy@708: $B%V%i%s%A$KL&gt;A0$r$D$1$k$K$O!"(B
foozy@708: $B$^$:$O(B \hgcmd{branches} $B$r;HMQ$7$^$9!#(B
foozy@708: $B$3$N%3%^%s%I$O!"%j%]%8%H%jCf$K4{$KB8:_$9$kL&gt;A0IU$-%V%i%s%A$H!"(B
foozy@708: $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
foozy@708: 
foozy@708: \interaction{branch-named.branches}
foozy@708: 
foozy@708: $B&lt;B9TNc$G$O!"(B
foozy@708: $BL&gt;A0IU$-%V%i%s%A$r@8@.$9$kA0$G$9$+$i!"(B
foozy@708: $BM#0lB8:_$9$k(B \texttt{default} $B$@$1$,I=&lt;($5$l$^$9!#(B
foozy@708: 
foozy@708: $B$I$l$,(B``$B8=:_$N(B''$B%V%i%s%A$+$rCN$k$K$O!"(B
foozy@708: $B0z?tL5$7$G(B \hgcmd{branch} $B%3%^%s%I$r&lt;B9T$7$^$9!#(B
foozy@708: $B$3$N%3%^%s%I$O!"(B
foozy@708: $B8=:_$N%A%'%s%8%;%C%H$N?F%A%'%s%8%;%C%H$,!"(B
foozy@708: $B$I$N%V%i%s%A&gt;e$K$"$k$b$N$+$rI=&lt;($7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.branch}
foozy@708: 
foozy@708: $B?7$7$$%V%i%s%A$r:n@.$9$k$K$O!"(B
foozy@708: $B:FEY(B \hgcmd{branch} $B%3%^%s%I$r&lt;B9T$7$^$9$,!"(B
foozy@708: $B:#2s$O@8@.$9$k%V%i%s%AL&gt;$r0z?t$H$7$F;XDj$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.create}
foozy@708: 
foozy@708: $B%V%i%s%A@8@.8e!"(B
foozy@708: \hgcmd{branch} $B%3%^%s%I$K$h$j$I$N$h$&amp;$JI{:nMQ$r@8$8$?$N$+!"(B
foozy@708: $B2x$7$`$+$b$7$l$^$;$s!#(B
foozy@708: \hgcmd{status} $B$d(B \hgcmd{tip} $B$N=PNO$O$I$&amp;$J$C$F$$$k$G$7$g$&amp;$+!)(B
foozy@708: 
foozy@708: \interaction{branch-named.status}
foozy@708: 
foozy@708: $B:n6HNN0h$KJQ99$O2C$($i$l$F$$$^$;$s$7!"(B
foozy@708: $BMzNr$KJQ2=$b$"$j$^$;$s!#(B
foozy@708: $B$3$N$3$H$,&lt;(:6$7$F$$$k$h$&amp;$K!"(B
foozy@708: \hgcmd{branch} $B%3%^%s%I$N&lt;B9T$O2?$i1JB3E*$J8z2L$r;}$A$^$;$s!#(B
foozy@708: $B$3$N%3%^%s%I$O!"(B
foozy@708: \emph{$B&lt;!2s$N(B}$B%A%'%s%8%;%C%H$N%3%_%C%H$N:]$K!"(B
foozy@708: $B2?$H$$$&amp;%V%i%s%AL&gt;$r;HMQ$9$k$+$r(B
foozy@708: Mercurial $B$KEA$($k$@$1$G$9!#(B
foozy@708: 
foozy@708: $BJQ99$r%3%_%C%H$9$k$H!"(B
foozy@708: Mercurial $B$O%3%_%C%H$5$l$?%A%'%s%8%;%C%H$K%V%i%s%AL&gt;$r5-O?$7$^$9!#(B
foozy@708: $B0lC6(B \texttt{default} $B%V%i%s%A$+$iB&gt;$N%V%i%s%A$K@Z$jBX$($F%3%_%C%H$7$?$J$i!"(B
foozy@708: \hgcmd{log}$B!"(B\hgcmd{tip} $B$d$=$l$KN`$9$k=PNO$r;}$D%3%^%s%I$N=PNO$K!"(B
foozy@708: $B?7$?$J%V%i%s%AL&gt;$,I=&lt;($5$l$F$$$k$3$H$G$7$g$&amp;!#(B
foozy@708: 
foozy@708: \interaction{branch-named.commit}
foozy@708: 
foozy@708: \hgcmd{log} $B$KN`$9$k%3%^%s%I$O!"(B
foozy@708: \texttt{default} $B%V%i%s%A0J30$KB0$9$kA4$F$N%A%'%s%8%;%C%H$KBP$7$F!"(B
foozy@708: $B%V%i%s%AL&gt;$rI=&lt;($7$^$9!#(B
foozy@708: $B$=$N$?$a!"L&gt;A0IU$-%V%i%s%A$r;H$o$J$$8B$j!"(B
foozy@708: $B%V%i%s%A$K4X$9$k&gt;pJs$r8+$k$3$H$O$"$j$^$;$s!#(B
foozy@708: 
foozy@708: $BL&gt;A0IU$-%V%i%s%A$r:n@.$7!"$=$N%V%i%s%AL&gt;$GJQ99$r%3%_%C%H$7$?$J$i$P!"(B
foozy@708: $B$=$NJQ99$KO"$J$k$=$N8e$N%3%_%C%H$O!"F1$8%V%i%s%AL&gt;$r0z$-7Q$.$^$9!#(B
foozy@708: \hgcmd{branch} $B%3%^%s%I$K$h$j!"(B
foozy@708: $BG$0U$N;~E@$G%V%i%s%AL&gt;$rJQ99$9$k$3$H$,$G$-$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.rebranch}
foozy@708: 
foozy@708: $B%V%i%s%AL&gt;$O$+$J$jD9$$&lt;wL?$r;}$D$?$a!"(B
foozy@708: $B&lt;B:]$K$O$3$N$h$&amp;$J%V%i%s%AL&gt;$NJQ99$O$=$l$[$IIQHK$K&lt;B9T$9$k$3$H$OL5$$$G$7$g$&amp;(B
foozy@708: $B!J$3$N$3$H$O5,Ls$G$O$J$/!"$"$/$^$G46A[$G$9!K!#(B
foozy@708: 
foozy@708: \section{Dealing with multiple named branches in a repository}
foozy@708: 
foozy@708: $B%j%]%8%H%j$KJ#?t$NL&gt;A0IU$-%V%i%s%A$,$"$k&gt;l9g!"(B
foozy@708: \hgcmd{update} $B$d(B \hgcmdargs{pull}{-u} $B$H$$$C$?%3%^%s%I&lt;B9T$N:]$K!"(B
foozy@708: Mercurial $B$O:n6HNN0h%G%#%l%/%H%j$,B0$9$k%V%i%s%A$r3P$($F$$$F!"(B
foozy@708: ``$B%j%]%8%H%jA4BN(B''$B$N(B tip $B%j%S%8%g%s$G$O$J$/!"(B
foozy@708: $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
foozy@708: $BJL$JL&gt;A0IU$-%V%i%s%A$N%j%S%8%g%s$G99?7$7$?$$&gt;l9g$O!"(B
foozy@708: \hgcmd{update} $B%3%^%s%I$K(B
foozy@708: \hgopt{update}{-C} $B%*%W%7%g%s$r;XDj$7$J$1$l$P$J$j$^$;$s!#(B
foozy@708: 
foozy@708: $B$3$N?6$kIq$$$O&gt;/!9HyL/$G$9$+$i!"&lt;BNc$G8+$F$_$^$7$g$&amp;!#(B
foozy@708: $B;O$a$K!"(B
foozy@708: $B$I$N%V%i%s%A&gt;e$G:n6H$7$F$$$k$N$+$H!"(B
foozy@708: $B$I$s$J%V%i%s%A$,%j%]%8%H%jCf$KM-$k$N$+$r3NG'$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.parents}
foozy@708: 
foozy@708: $B8=:_(B \texttt{bar} $B%V%i%s%A&gt;e$K$$$^$9$,!"(B
foozy@708: $B8E$$(B \hgcmd{foo} $B%V%i%s%A$bB8:_$7$^$9!#(B
foozy@708: 
foozy@708: \texttt{foo} $B%V%i%s%A$*$h$S(B \texttt{bar} $B%V%i%s%A$N(B
foozy@708: tip $B%j%S%8%g%s$X$N0\F0$O!"(B
foozy@708: $BJQ99MzNr&gt;e$rD&gt;@~E*$KA08e$9$k$3$H$7$+I,MW$H$7$J$$$?$a!"(B
foozy@708: \hgcmd{update} $B%3%^%s%I$K(B
foozy@708: \hgopt{update}{-C} $B%*%W%7%g%s$r;XDj$9$k$3$HL5$7$K!"(B
foozy@708: $B$=$l$&gt;$l$N(B tip $B%j%S%8%g%s$X$N99?7$r9T$&amp;$3$H$,$G$-$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.update-switchy}
foozy@708: 
foozy@708: \texttt{foo} $B%V%i%s%A$KLa$k$?$a$K(B
foozy@708: \hgcmd{update} $B%3%^%s%I$r&lt;B9T$9$k$H!"(B
foozy@708: \texttt{foo} $B%V%i%s%A&gt;e$KN1$^$C$?$^$^$G(B
foozy@708: \texttt{bar} $B%V%i%s%A$N(B tip $B%j%S%8%g%s$K$O0\F0$7$^$;$s!#(B
foozy@708: 
foozy@708: \interaction{branch-named.update-nothing}
foozy@708: 
foozy@708: \texttt{foo} $B%V%i%s%A$G$NJQ99$N%3%_%C%H$K$h$j!"(B
foozy@708: $B?7$?$J%X%C%I$,@8@.$5$l$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.foo-commit}
foozy@708: 
foozy@708: \texttt{foo} $B%V%i%s%A$+$i(B \texttt{bar} $B%V%i%s%A$X$N99?7$O!"(B
foozy@708: $BMzNr$r(B``$B2#$CHt$S(B''$B$7$J$$$H$G$-$^$;$s$+$i!"(B
foozy@708: Mercurial $B$O(B
foozy@708: \hgcmd{update} $B%3%^%s%I$X$N(B \hgopt{update}{-C}
foozy@708: $B%*%W%7%g%s$N;XDj$rI,MW$H$7$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.update-bar}
foozy@708: 
foozy@708: \section{Branch names and merging}
foozy@708: 
foozy@708: $B$*5$$E$-$N;v$H$O;W$$$^$9$,!"(B
foozy@708: Mercurial $B$K$*$1$k%^!&lt;%8=hM}$OBP&gt;NE*$G$O$"$j$^$;$s!#(B
foozy@708: $B%j%S%8%g%sHV9f(B 17 $B$N$b$N$H(B 23 $B$N$b$N!"(B
foozy@708: $B#2$D$N%X%C%I$r%j%]%8%H%j$,;}$C$F$$$k$b$N$H$7$^$7$g$&amp;!#(B
foozy@708: $B%j%S%8%g%s(B 17 $B$X$H(B \hgcmd{update} 
foozy@708: $B$7$F$+$i%j%S%8%g%s(B 23 $B$H(B \hgcmd{merge} $B$7$?&gt;l9g!"(B
foozy@708: Mercurial $B$O%j%S%8%g%s(B 17 $B$r%^!&lt;%8$NBh#1?F!"(B
foozy@708: $B%j%S%8%g%s(B 23 $B$rBh#2?F$H$7$F5-O?$7$^$9!#(B
foozy@708: $B0lJ}$G!"(B
foozy@708: $B%j%S%8%g%s(B 23 $B$X$H(B \hgcmd{update}
foozy@708: $B$7$F$+$i%j%S%8%g%s(B 17 $B$H(B \hgcmd{merge} $B$7$?&gt;l9g!"(B
foozy@708: $B%j%S%8%g%s(B 23 $B$,%^!&lt;%8$NBh#1?F!"(B
foozy@708: $B%j%S%8%g%s(B 17 $B$,Bh#2?F$H$7$F5-O?$5$l$^$9!#(B
foozy@708: 
foozy@708: $B$3$N?6$kIq$$$,!"%^!&lt;%8$r9T$C$?:]$N(B Mercurial $B$N%V%i%s%AL&gt;A*Br$K1F6A$7$^$9!#(B
foozy@708: $B%^!&lt;%88e$K$=$N7k2L$r%3%_%C%H$9$k$H!"(B
foozy@708: Mercurial $B$OBh#1?F$N%V%i%s%AL&gt;$r0];}$7$h$&amp;$H$7$^$9!#(B
foozy@708: $BBh#1?F$N%V%i%s%AL&gt;$,(B \texttt{foo} $B$G!"(B
foozy@708: \texttt{bar} $B%V%i%s%A$N%j%S%8%g%s$H%^!&lt;%8$7$?&gt;l9g!"(B
foozy@708: $B%^!&lt;%88e$N%V%i%s%AL&gt;$O(B \texttt{foo} $B$N$^$^$H$J$j$^$9!#(B
foozy@708: 
foozy@708: $B%j%]%8%H%jCf$KF1$8%V%i%s%AL&gt;$NJ#?t$N%X%C%I$,B8:_$9$k$3$H$O!"(B
foozy@708: $B$=$l$[$IDA$7$$$3$H$G$O$"$j$^$;$s!#(B
foozy@708: $BNc$($P!";d$H$"$J$?$,(B \texttt{foo} $B%V%i%s%A$G:n6H$7$F$$$k$H$7$^$9!#(B
foozy@708: $BFs?M$,$=$l$&gt;$l0[$J$kJQ99$r%3%_%C%H$7!"(B
foozy@708: $B;d$,$"$J$?$NJQ99$r(B pull $B$7$^$7$?!#(B
foozy@708: $B$3$N;~E@$G;d$N%j%]%8%H%j$K$O!"(B
foozy@708: \texttt{foo} $B%V%i%s%A&gt;e$K#2$D$N%X%C%I$,B8:_$7$^$9!#(B
foozy@708: $B%^!&lt;%8$N7k2L!"(B
foozy@708: \texttt{foo} $B%V%i%s%A&gt;e$N#2$D$N%X%C%I$O4|BTDL$j#1$D$K$J$j$^$9!#(B
foozy@708: 
foozy@708: $B$7$+$7!";d$,(B \texttt{bar} $B%V%i%s%A$G:n6H$7$F$$$F!"(B
foozy@708: \texttt{foo} $B%V%i%s%A$N@.2L$r%^!&lt;%8$7$?&gt;l9g!"(B
foozy@708: $B%^!&lt;%8$N7k2L$O(B \texttt{bar} $B%V%i%s%A&gt;e$KN1$^$j$^$9!#(B
foozy@708: 
foozy@708: \interaction{branch-named.merge}
foozy@708: 
foozy@708: $B$h$j6qBNE*$JNc$H$7$F!"(B
foozy@708: \texttt{bleeding-edge} $B%V%i%s%A$G:n6H$7$F$$$F!"(B
foozy@708: $B:G?7$N@.2L$r(B \texttt{stable} $B%V%i%s%A$+$i;}$A9~$_$?$$$H;W$C$?$H$7$^$9!#(B
foozy@708: $B$3$N&gt;l9g!"(B
foozy@708: \texttt{stable} $B%V%i%s%A$N@.2L$r(B pull $B$7$F%^!&lt;%8$7$?CJ3,$G!"(B
foozy@708: Mercurial $B$O(B``$BE,@Z$J(B''$B%V%i%s%AL&gt;(B(\texttt{bleeding-edge})$B$rA*Br$7$^$9!#(B
foozy@708: 
foozy@708: \section{Branch naming is generally useful}
foozy@708: 
foozy@708: $B&lt;wL?$ND9$$J#?t$N%V%i%s%A$,C10l%j%]%8%H%j$G6&amp;B8$7$F$$$k&gt;u67$@$1$,!"(B
foozy@708: $BL&gt;A0IU$-%V%i%s%A$NMxMQ$G$-$k&gt;u67$@$H$O9M$($J$$$G$/$@$5$$!#(B
foozy@708: $B%j%]%8%H%j#1$D$K%V%i%s%A#1$D$N&gt;u67$G$"$C$F$b!"(B
foozy@708: $BL&gt;A0IU$-%V%i%s%A$OM-MQ$G$9!#(B
foozy@708: 
foozy@708: $BC1=c$JNc$H$7$F$O!"(B
foozy@708: $B%V%i%s%A$KL&gt;A0$rIUM?$9$k$3$H$G!"(B
foozy@708: $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
foozy@708: $B$3$N5-O?$O!"(B
foozy@708: $B&lt;wL?$ND9$$%V%i%s%A$r;}$D%W%m%8%'%/%H$NMzNr$rC)$k:]$K!"(B
foozy@708: $BB?$/$N&gt;pJs$r$b$?$i$9$3$H$G$7$g$&amp;!#(B
foozy@708: 
foozy@708: $B%j%]%8%H%j$r6&amp;M-$7$F:n6H$7$F$$$k&gt;l9g!"(B
foozy@708: \hook{pretxnchangegroup}  $B%U%C%/$r$=$l$&gt;$l$N%j%]%8%H%j$KBP$7$F@_Dj$9$k$3$H$G!"(B
foozy@708: ``$BIT@5$J(B''$B%V%i%s%AL&gt;$r;}$DJQ99$,;}$A9~$^$l$k$N$rKI$0$3$H$,$G$-$^$9!#(B
foozy@708: $B$3$N&lt;jK!$OC1=c$G$9$,!"(B
foozy@708: ``$B7l$NE)$k?O(B''$B$H$G$b8@$&amp;$Y$-!JIT0BDj$J!K%V%i%s%A$N@.2L$r!"(B
foozy@708: $B8m$C$F(B``$B0BDj$7$?(B''$B%V%i%s%A$X$H;}$A9~$`$3$H$rKI$0$K$O8z2LE*$G$9!#(B
foozy@708: $B$3$N$h$&amp;$J%U%C%/$O!"(B
foozy@708: $B6&amp;M-%j%]%8%H%j$N(B \hgrc $B%U%!%$%k$K0J2&lt;$N$h$&amp;$K5-=R$7$^$9!#(B
foozy@708: 
foozy@708: \begin{codesample2}
foozy@708:   [hooks]
foozy@708:   pretxnchangegroup.branch = hg heads --template '{branches} ' | grep mybranch
foozy@708: \end{codesample2}
foozy@708: 
foozy@708: %%% Local Variables: 
foozy@708: %%% mode: latex
foozy@708: %%% TeX-master: "00book"
foozy@708: %%% End: 




</pre></body></html>