hgbook
diff ja/concepts.tex @ 984:cc81b4175833
some spelling mistakes corrected in fr/appA-svn.xml
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Wed Sep 09 15:12:25 2009 +0200 (2009-09-09) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/concepts.tex Wed Sep 09 15:12:25 2009 +0200 1.3 @@ -0,0 +1,764 @@ 1.4 +\chapter{Behind the scenes} 1.5 +\label{chap:concepts} 1.6 + 1.7 +$BB?$/$N9=@.4IM}%7%9%F%`$H0[$J$j!"(B 1.8 +Mercurial $B$,4p$K$7$F$$$k35G0$OHs>o$KC1=c$J$N$G!"(B 1.9 +Mercurial $B$N%W%m%0%i%`$,<B:]$K$I$N$h$&$KF0:n$9$k$N$+$rM}2r$9$k$N$O4JC1$G$9!#(B 1.10 +$B$=$N$h$&$JCN<1$OI,MWL5$$$+$b$7$l$^$;$s$,!"(B 1.11 +$BI.<T$OFb>p$K4X$9$k(B``$B35G0M}2r(B''$B$,M-MQ$G$"$k$H9M$($F$$$^$9!#(B 1.12 + 1.13 +$BI.<T<+?H$O!"Fb>p$rM}2r$9$k$3$H$G!"(B 1.14 +Mercurial $B$,(B\emph{$B0BA4@-(B}$B$H(B\emph{$B8zN((B}$B$KN10U$7$F@_7W$5$l$F$$$k!"(B 1.15 +$B$H$$$&3N?.$rF@$k$3$H$,$G$-$^$7$?!#(B 1.16 +$B$^$?!"(B 1.17 +$B9=@.4IM}A`:n$r9T$C$?:]$K%=%U%H%&%'%"$,$I$N$h$&$K5!G=$9$k$N$+$r!"(B 1.18 +$BMF0W$K3P$($F$*$1$k$N$G$"$l$P!"(B 1.19 +$B9=@.4IM}%D!<%k$N?6$kIq$$$K6C$+$5$l$k5!2q$,8:$k!"(B 1.20 +$B$H$$$&E@$bHs>o$K=EMW$G$9!#(B 1.21 + 1.22 +$B$3$N>O$G$O!"(B 1.23 +$B:G=i$K(B 1.24 +Mercurial $B$N@_7W$K$*$1$kCf3KE*$J35G0$K$D$$$F@bL@$7$?>e$G!"(B 1.25 +$B<BAu$K$*$1$k6=L#?<$$E@$K4X$9$k>\:Y$r4v$D$+<h$j>e$2$h$&$H;W$$$^$9!#(B 1.26 + 1.27 +\section{Mercurial's historical record} 1.28 + 1.29 +\subsection{Tracking the history of a single file} 1.30 + 1.31 +$B%U%!%$%k$NJQ99$rDI@W$9$k>l9g!"(B 1.32 +Mercurial $B$O%U%!%$%k$NMzNr$r(B 1.33 +\emph{filelog} $B$H8F$P$l$k%a%?%G!<%?%*%V%8%'%/%H7A<0$GJ]B8$7$^$9!#(B 1.34 +filelog $B$K5-O?$5$l$k8D!9$NMWAG$O!"(B 1.35 +$BDI@WBP>]%U%!%$%k$N!"(B 1.36 +$B$H$"$k%j%S%8%g%s$r:F8=$9$k$N$K==J,$J>pJs$rJ];}$7$F$$$^$9!#(B 1.37 +filelog $B$O(B 1.38 +\sdirname{.hg/store/data} $B%G%#%l%/%H%jG[2<$K%U%!%$%k$H$7$FJ]B8$5$l$F$*$j!"(B 1.39 +$BMzNr>pJs$H!"(B 1.40 +Mercurial $B$N%j%S%8%g%s8!:w$rJd=u$9$k%$%s%G%C%/%9$N!"(B 1.41 +$B#2<oN`$N>pJs$rJ];}$7$F$$$^$9!#(B 1.42 + 1.43 +$B%5%$%:$,Bg$-$+$C$?$jJQ99MzNr$NB?$$%U%!%$%k$N>l9g!"(B 1.44 +filelog $B$rMzNr>pJs!J3HD%;R(B ``\texttt{.d}''$B!K(B 1.45 +$B$H%$%s%G%C%/%9!J3HD%;R(B ``\texttt{.i}''$B!K$N#2$D$KJ,N%$7$FJ]B8$5$l$^$9!#(B 1.46 +$BJQ99MzNr$,$=$l$[$IL5$$>.$5$J%U%!%$%k$N>l9g!"(B 1.47 +$BMzNr>pJs$H%$%s%G%C%/%9$O(B 1.48 +``\texttt{.i}'' $B3HD%;R$r;}$DC10l$N%U%!%$%k$KJ]B8$5$l$^$9!#(B 1.49 +$B:n6HNN0h%G%#%l%/%H%jCf$N%U%!%$%k$H!"(B 1.50 +$B$=$NJQ99MzNr$rDI@W$9$k$?$a$N%j%]%8%H%jCf$N(B filelog $B%U%!%$%k$NBP1~$r!"(B 1.51 +$B?^(B~\ref{fig:concepts:filelog}$B$K<($7$^$9!#(B 1.52 + 1.53 +\begin{figure}[ht] 1.54 + \centering 1.55 + \grafix{filelog} 1.56 + \caption{Relationships between files in working directory and 1.57 + filelogs in repository} 1.58 + \label{fig:concepts:filelog} 1.59 +\end{figure} 1.60 + 1.61 +\subsection{Managing tracked files} 1.62 + 1.63 + 1.64 +$BDI@WBP>]%U%!%$%k$N>pJs$r$^$H$a$k$?$a$K!"(B 1.65 +Mercurial $B$O(B \emph{manifest} $B$H8F$P$l$k9=B$$r;HMQ$7$F$$$^$9!#(B 1.66 +manifest $B$K5-O?$5$l$k8D!9$NMWAG$O!"(B 1.67 +$BEv3:%A%'%s%8%;%C%H$K$*$1$k%U%!%$%k$N0lMw$d!"(B 1.68 +$B3F%U%!%$%k$N%j%S%8%g%s!"(B 1.69 +$B4v$D$+$N%U%!%$%k$N%a%?%G!<%?$H$$$C$?!"(B 1.70 +$B8D!9$N%A%'%s%8%;%C%H$4$H$N%U%!%$%k$K4X$9$k>pJs$rJ];}$7$F$$$^$9!#(B 1.71 + 1.72 +\subsection{Recording changeset information} 1.73 + 1.74 +\emph{changelog} $B$O!"(B 1.75 +$B%A%'%s%8%;%C%H$N%3%_%C%H<g$d!"(B 1.76 +$B%3%_%C%H;~$N%m%0%a%C%;!<%8!"(B 1.77 +$B$=$NB>%A%'%s%8%;%C%H$K4X$9$k4v$D$+$N>pJs$d!"(B 1.78 +manifest $B$N%j%S%8%g%s$H$$$C$?!"(B 1.79 +$B8D!9$N%A%'%s%8%;%C%H$K4X$9$k>pJs$rJ];}$7$F$$$^$9!#(B 1.80 + 1.81 +\subsection{Relationships between revisions} 1.82 + 1.83 +changelog$B!"(Bmanifest $B$J$$$7(B filelog $B$K$*$1$k8D!9$N%j%S%8%g%s$O!"(B 1.84 +$BD>@\$N?F%j%S%8%g%s(B 1.85 +$B!J%^!<%8$r9T$C$?%j%S%8%g%s$N>l9g$O!"(B 1.86 +$B%^!<%8BP>]$H$J$C$?#2$D$N?F%j%S%8%g%s!K(B 1.87 +$B$X$N;2>H$rJ];}$7$F$$$^$9!#(B 1.88 +$B:#=R$Y$?$h$&$K!"(B 1.89 +$B3F9=B$$K(B\emph{$B$^$?$,$C$?(B}$B4XO"@-$r$b$A!"(B 1.90 +$B$=$l$i$OI,A3E*$K3,AX9=B$$r;}$C$F$$$^$9!#(B 1.91 + 1.92 +$B%j%]%8%H%jCf$NA4$F$N%A%'%s%8%;%C%H$K4X$7$F!"(B 1.93 +changelog $B$K$O87L)$K#1$D$N%j%S%8%g%s$,J]B8$5$l$^$9!#(B 1.94 +changelog $B$K$*$1$k3F%j%S%8%g%s$O!"(B 1.95 +manifest $BCf$N%j%S%8%g%s$X$N;2>H$rJ];}$7$F$$$^$9!#(B 1.96 +manifest $BCf$N3F%j%S%8%g%s$O!"(B 1.97 +$B%A%'%s%8%;%C%H$,@8@.$5$l$?:]$N3F%U%!%$%k$N%j%S%8%g%s$KBP1~$9$k(B 1.98 +filelog $BCf$N%j%S%8%g%s$X$N;2>H$rJ];}$7$F$$$^$9!#(B 1.99 +$B$3$N4XO"@-$r?^(B~\ref{fig:concepts:metadata}$B$K<($7$^$9!#(B 1.100 + 1.101 +\begin{figure}[ht] 1.102 + \centering 1.103 + \grafix{metadata} 1.104 + \caption{Metadata relationships} 1.105 + \label{fig:concepts:metadata} 1.106 +\end{figure} 1.107 + 1.108 +$B?^$+$i$b$o$+$k$h$&$K!"(B 1.109 +changelog$B!"(Bmanifest $B$*$h$S(B 1.110 +filelog $B$,J];}$9$k%j%S%8%g%s>pJs4V$N4X78$O!"(B 1.111 +$BI,$:$7$b(B``$B#1BP#1(B''$B$H$$$&$o$1$G$O$"$j$^$;$s!#(B 1.112 +$B#2$D$N%A%'%s%8%;%C%H$N4V$G(B 1.113 +manifest $B$,JQ99$5$l$F$$$J$$>l9g!"(B 1.114 +$B$=$l$i$N%A%'%s%8%;%C%H$KBP1~$9$k(B changelog $BMWAG$O!"(B 1.115 +manifest $BCf$NF1$8%j%S%8%g%s$r;2>H$7$^$9!#(B 1.116 +$B#2$D$N%A%'%s%8%;%C%H$N4V$G(B 1.117 +Mercurial $B$,DI@W$9$k%U%!%$%k$,JQ99$5$l$F$$$J$$>l9g!"(B 1.118 +$B$=$l$i$N%A%'%s%8%;%C%H$KBP1~$9$k(B manifest $BMWAG$O!"(B 1.119 +filelog $BCf$NF1$8%j%S%8%g%s$r;2>H$7$^$9!#(B 1.120 + 1.121 +\section{Safe, efficient storage} 1.122 + 1.123 +changelog$B!"(Bmanifest $B$*$h$S(B filelog $B$O!"(B 1.124 +\emph{revlog} $B$H8F$P$l$kF1$89=B$$K$h$j9=@.$5$l$F$$$^$9!#(B 1.125 + 1.126 +\subsection{Efficient storage} 1.127 + 1.128 +revlog $B$O(B \emph{$B:9J,(B}$B<jK!$H$$$&;EAH$_$r;HMQ$7$F!"(B 1.129 +$B%j%S%8%g%s>pJs$r8zN(E*$K3JG<$7$F$$$^$9!#(B 1.130 +$B:9J,<jK!$G$O!"(B 1.131 +$B%U%!%$%k$N3F%j%S%8%g%s$4$H$K40A4$JJ#@=$rJ];}$9$kBe$o$j$K!"(B 1.132 +$B5l%j%S%8%g%s$+$i?7%j%S%8%g%s$X$NJQ7A$KI,MW$J>pJs$rJ];}$7$^$9!#(B 1.133 +$BB?$/$N%U%!%$%k$G$N%G!<%?3JG<$K$*$$$F!"(B 1.134 +$B:9J,<jK!$O0lHLE*$K40A4$JJ#@=$N>l9g$N?t%Q!<%;%s%HDxEY$N%5%$%:$K$J$j$^$9!#(B 1.135 + 1.136 +$B5l<0$N9=@.4IM}%7%9%F%`$G$O!"(B 1.137 +$B%F%-%9%H7A<0$N%U%!%$%k$G$7$+:9J,<jK!$,E,MQ$G$-$J$$$b$N$b$"$j$^$9!#(B 1.138 +$B$=$l$i$N%7%9%F%`$K$*$1$k%P%$%J%j%U%!%$%k$N3JG<$O!"(B 1.139 +$B40A4$J%9%J%C%W%7%g%C%H$+!"(B 1.140 +$B%F%-%9%HI=8=7A<0$X$NJQ49$K$h$C$F9T$o$l$^$9$,!"(B 1.141 +$B$3$l$i$O6&$KIT7P:Q$J<jK!$G$9!#(B 1.142 +$BG$0U$N%P%$%J%j%G!<%?$r4^$`%U%!%$%k$G$"$C$F$b!"(B 1.143 +Mercurial $B$O:9J,$r8zN(E*$K07$&$3$H$,$G$-$^$9$N$G!"(B 1.144 +$B%F%-%9%H$rFCJL07$$$9$kI,MW$O$"$j$^$;$s(B\footnote{$BLuCm(B: 1.145 +<code>cvs add</code> $B$K$*$1$k(B 1.146 +<code>-kb</code> $B;XDj$N7gMn$K$h$k%U%!%$%kFbMF$NGKB;!"(B 1.147 +$B$H$$$C$??4G[$O$"$j$^$;$s!#(B 1.148 +$BL`$b!"(BMercurial $B$N4pDlF0:n$G$O!"(B 1.149 +$B%-!<%o!<%I$NCV49Ey$r9T$$$^$;$s$N$G!"(B 1.150 +$B$=$b$=$b?4G[$9$kI,MW$,L5$$$N$G$9$,!D!#(B}$B!#(B 1.151 + 1.152 +\subsection{Safe operation} 1.153 +\label{sec:concepts:txn} 1.154 + 1.155 +Mercurial $B$O(B revlog $B$NKvHx$K%G!<%?$r(B\emph{$BDI2C(B}$B$9$k$@$1$G!"(B 1.156 +$B=q$-9~$^$l$?8e$+$i%U%!%$%k$N0lIt$r2~JQ$9$k$h$&$J$3$H$O9T$$$^$;$s!#(B 1.157 +$B4{B8%G!<%?$N2~JQ$rI,MW$H$9$k;EAH$_$HHf3S$7$?>l9g!"(B 1.158 +$B$3$N<jK!$O7xO43n$D8zN(E*$G$9!#(B 1.159 + 1.160 +$B$=$l$K2C$($F!"(B 1.161 +Mercurial $B$OJ#?t$N%U%!%$%k$K$^$?$,$C$?A4$F$N=q$-9~$_$r!"(B 1.162 +$BC10l$N(B\emph{$B%H%i%s%6%/%7%g%s(B}$B$N0lIt$H$7$F07$$$^$9!#(B 1.163 +$B%H%i%s%6%/%7%g%s$O(B\emph{$BIT2DJ,(B}$B$J$b$N$H$7$F07$o$l$^$9$N$G!"(B 1.164 +$B%H%i%s%6%/%7%g%sA4BN$,@.8y$9$l$P7k2L$NA4$F$,MxMQ<T$K8+$($k$h$&$K$J$j$^$9$,!"(B 1.165 +$B%H%i%s%6%/%7%g%s$N0lIt$G$b<:GT$7$?>l9g$K$O!"(B 1.166 +$BA4$F$N=q$-9~$_A`:n$O<h$j>C$5$l$^$9!#(B 1.167 +$B0lJ}$O%G!<%?$NFI$_9~$_$r9T$$B>J}$O%G!<%?$N=q$-=P$7$r9T$&$h$&$J!"(B 1.168 +$B#2$D$N(B Mercurial $B%W%m%;%9$rF1;~$K<B9T$7$?>l9g$G$b!"(B 1.169 +$B$3$NIT2DJ,J]>Z$K$h$j!"(B 1.170 +$BFI$_9~$_$r:.Mp$5$;$k$h$&$JItJ,E*$J=q$-9~$_%G!<%?$r!"(B 1.171 +$B%G!<%?FI$_9~$_B&$N%W%m%;%9$,FI$_9~$`$3$H$O$"$j$^$;$s(B 1.172 +\footnote{$BLuCm(B: 1.173 +$B87L)$K$O$3$N5-=R$O@5$7$/$"$j$^$;$s!#(B 1.174 +$B>\:Y$O(B \ref{sec:hook:carepretxn}~$B@a$r;2>H$7$F$/$@$5$$!#(B}$B!#(B 1.175 + 1.176 +Mercurial $B$,%U%!%$%k$X$NDI2C$7$+9T$o$J$$$3$H$,!"(B 1.177 +$B%H%i%s%6%/%7%g%s$NIT2DJ,@-J]>Z$NDs6!$rMF0W$K$7$F$$$^$9!#(B 1.178 +$B%H%i%s%6%/%7%g%sJ]>Z$,MF0W$G$"$kDx!"(B 1.179 +$B$=$l$,@5$7$/5!G=$7$F$$$k$3$H$r3N?.$G$-$kH&$G$9!#(B 1.180 + 1.181 +\subsection{Fast retrieval} 1.182 + 1.183 +$B=i4|$N9=@.4IM}%7%9%F%`$,6&$K4Y$C$F$$$?(B\emph{$BHs8zN($JI|5l(B}$BLdBj$NMn$H$77j$r!"(B 1.184 +Mercurial $B$O>e<j$K2sHr$7$F$$$^$9!#(B 1.185 +$BKX$I$N9=@.4IM}%7%9%F%`$O!"(B 1.186 +``$B%9%J%C%W%7%g%C%H(B''$B$KBP$9$kJQ99$NDI2CE*$JO"B3$H$7$F!"(B 1.187 +$B%j%S%8%g%s$NFbMF$rJ];}$7$F$$$^$7$?!#(B 1.188 +$B$3$N<jK!$N>l9g!"(B 1.189 +$BFCDj$N%j%S%8%g%s$r:F9=C[$9$k$K$O!"(B 1.190 +$B:G=i$K%9%J%C%W%7%g%C%H$rFI$_9~$_!"(B 1.191 +$BB3$$$FBP>]%j%S%8%g%s$H$N4V$NA4$F$N:9J,%G!<%?$rFI$_9~$`I,MW$,$"$j$^$9!#(B 1.192 +$B%U%!%$%k$NMzNr$,@Q$_=E$J$k$[$I!"(B 1.193 +$B:9J,%G!<%?$rFI$_9~$^$J$1$l$P@.$i$J$$%j%S%8%g%s$,A}2C$7!"(B 1.194 +$BFCDj$N%j%S%8%g%s$N:F9=C[$K;~4V$,I,MW$H$J$j$^$9!#(B 1.195 + 1.196 +\begin{figure}[ht] 1.197 + \centering 1.198 + \grafix{snapshot} 1.199 + \caption{Snapshot of a revlog, with incremental deltas} 1.200 + \label{fig:concepts:snapshot} 1.201 +\end{figure} 1.202 + 1.203 +Mercurial $B$,$3$NLdBj$N2r7h$K;HMQ$7$F$$$k<jK!$O!"(B 1.204 +$B4JC1$J$b$N$G$9$,8z2LE*$G$9!#(B 1.205 +$BA02s$N%9%J%C%W%7%g%C%H:n@.;~E@$+$i!"(B 1.206 +$B8GDj$5$l$?ogCM$rD6$($F:9J,>pJs$,C_@Q$5$l$?:]$K$O!"(B 1.207 +$B:9J,>pJs$NC_@Q$G$O$J$/!"(B 1.208 +$B?7$?$J%9%J%C%W%7%g%C%H!JL^O@05=L$O9T$$$^$9!K$rJ]B8$9$k!"(B 1.209 +$B$H$$$&$b$N$G$9!#(B 1.210 +$B$3$N<jK!$O!"(B 1.211 +\emph{$BG$0U$N(B}$B%j%S%8%g%s$K$*$1$k%U%!%$%k$rAGAa$/:F9=C[$G$-$^$9!#(B 1.212 +$B$3$N<jK!$OHs>o$KM-8z$G$"$k$?$a!"(B 1.213 +$BB>$N4v$D$+$N9=@.4IM}%7%9%F%`$K$b<h$j9~$^$l$F$$$^$9!#(B 1.214 + 1.215 +$B?^(B~\ref{fig:concepts:snapshot}$B$N35MW$,<($9$h$&$K!"(B 1.216 +Mercurial $B$O!"(B 1.217 +revlog $B$N%$%s%G%C%/%9%U%!%$%k$K$*$1$k3FMWAG$K!"(B 1.218 +$BFCDj$N%j%S%8%g%s$N:F9=C[$N:]$KFI$_9~$_$,I,MW$H$5$l$k!"(B 1.219 +$B%G!<%?%U%!%$%kCf$NMWAG$NHO0O$r3JG<$7$^$9!#(B 1.220 + 1.221 +\subsubsection{Aside: the influence of video compression} 1.222 + 1.223 +$BF02h05=L$r=OCN$7$F$$$k$+!"(B 1.224 +$B%1!<%V%k$J$$$71R@1$K$h$k%G%8%?%k%F%l%SG[?.$r;kD0$7$?$3$H$,$"$k$J$i$P!"(B 1.225 +$B$?$$$F$$$NF02h05=L7A<0$K$*$$$F3FF02h%U%l!<%`$,!"(B 1.226 +$B@h9T$9$k%U%l!<%`$H$N:9J,$GJ];}$5$l$F$$$k$3$H$r$4B8CN$+$b$7$l$^$;$s!#(B 1.227 +$B2C$($F$=$l$i$N7A<0$G$O!"(B 1.228 +$B05=LN($r8~>e$5$;$k$?$a$K(B``$BHs2D5U(B''$B05=L<jK!$rMQ$$$F$$$^$9$N$G!"(B 1.229 +$B%U%l!<%`4V:9J,$N?t$K1~$8$F;k3PE*%(%i!<$,C_@Q$5$l$^$9!#(B 1.230 + 1.231 +$BF02hG[?.$N>l9g!"(B 1.232 +$B;~@^$N?.9f0[>o$K$h$k(B``$B7gMn(B''$B$,M-$jF@$^$9$7!"(B 1.233 +$B2D5U05=L2aDx$K$h$j@8$8$k8m:9$NC_@Q$r@)8B$9$kI,MW$b$"$k$?$a!"(B 1.234 +$BF02h05=LB&$G$ODj4|E*$K40A4$J%U%l!<%`(B 1.235 +$B!J(B``$B%-!<%U%l!<%`(B''$B$H8F$P$l$^$9!K$r05=L7A<0$NCf$KA^F~$7$^$9!#(B 1.236 +$B$3$l$OF02h?.9f$,CfCG$5$l$F$b!"(B 1.237 +$B<!$N%-!<%U%l!<%`$NE~Ce;~E@$+$i$N:F3+$,2DG=$G$"$k$3$H$r0UL#$7$^$9!#(B 1.238 +$BId9f2=%(%i!<$NC_@Q$b!"(B 1.239 +$B8D!9$N%-!<%U%l!<%`$G%/%j%"$5$l$^$9!#(B 1.240 + 1.241 +\subsection{Identification and strong integrity} 1.242 + 1.243 +$B:9J,$J$$$7%9%J%C%W%7%g%C%H>pJs$N%G!<%?$KBP$7$F!"(B 1.244 +revlog $BMWAG$O0E9f2=$KMQ$$$i$l$k%O%C%7%eCM$r7W;;$7$FJ];}$7$F$$$^$9!#(B 1.245 +$B$3$l$K$h$j!"(B 1.246 +$B%j%S%8%g%s$K4X$9$k>pJs$N56B$$r:$Fq$K$9$k$HF1;~$K!"(B 1.247 +$BITN8$NGKB;$N8!=P$,MF0W$K$J$j$^$9!#(B 1.248 + 1.249 +$B%O%C%7%eCM$N;;=P$O!"(B 1.250 +$BC1$J$kGKB;$N8!=P0J>e$N$b$N$r$b$?$i$7$^$9!#(B 1.251 +$B%O%C%7%eCM$O3F%j%S%8%g%s$N<1JL;R$H$7$F;HMQ$5$l$^$9!#(B 1.252 +Mercurial $B$N%(%s%I%f!<%6$H$7$FL\$K$9$k%A%'%s%8%;%C%H<1JL;R$N%O%C%7%eCM$O!"(B 1.253 +changelog $B$N%j%S%8%g%s$KM3Mh$9$kCM$G$9!#(B 1.254 +filelog $B$d(B manifest $B$G$b%O%C%7%eCM$r;HMQ$7$F$$$^$9$,!"(B 1.255 +Mercurial $B$G$O$3$l$i$OIqBfN"$N$_$G;HMQ$5$l$F$$$^$9!#(B 1.256 + 1.257 +$BFCDj%j%S%8%g%s$N%U%!%$%k$r:F9=C[$9$k>l9g$d!"(B 1.258 +$BB>$N%j%]%8%H%j$+$i%A%'%s%8%;%C%H$r<h$j9~$s$@>l9g!"(B 1.259 +Mercurial $B$O%O%C%7%eCM$,@5$7$$$3$H$r3NG'$7$^$9!#(B 1.260 +$B0l4S@-$KLdBj$,$"$k$3$H$,8!=P$5$l$?>l9g!"(B 1.261 +$B7Y9p$rH/$7$?>e$G!"(B 1.262 +$B?J9TCf$NA4$F$N=hM}$rDd;_$7$^$9!#(B 1.263 + 1.264 +Mercurial $B$,Dj4|E*$K:9$79~$s$G$$$k%9%J%C%W%7%g%C%H$O!"(B 1.265 +$BFCDj%j%S%8%g%s$N:F9=C[$N:]$N8zN($K2C$($F!"(B 1.266 +$BItJ,E*$J%G!<%?$NGKB;$KBP$9$k7xO4@-$r$b$?$i$7$F$^$9!#(B 1.267 +$B%O!<%I%&%'%"%(%i!<$d%7%9%F%`$N%P%0$K$h$C$F!"(B 1.268 +revlog $B$,ItJ,E*$KGKB;$7$?>l9g!"(B 1.269 +$BGKB;$rLH$l$?(B revlog $B$N%G!<%?$+$i!"(B 1.270 +$BGKB;$7$?It0L$NA08e6&$K!"(B 1.271 +$B0lIt!J$"$k$$$OKX$I$N!K%j%S%8%g%s$rI|5l$9$k$3$H$,2DG=$G$9!#(B 1.272 +$B:9J,$N$_$rJ];}$9$k%b%G%k$r:NMQ$9$k9=@.4IM}%7%9%F%`$G$O!"(B 1.273 +$B$3$N$h$&$J$3$H$O$G$-$^$;$s!#(B 1.274 + 1.275 +\section{Revision history, branching, and merging} 1.276 + 1.277 +$BA4$F$N(B Mercurial $B$N(B revlog $BMWAG$O!"(B 1.278 +$BDL>o$O(B\emph{$B?F(B}$B$H8@$o$l$kD>A0$N%j%S%8%g%s$N<1JL;R$rJ];}$7$F$$$^$9!#(B 1.279 +$B<B:]$K$O!"(B 1.280 +$B3F(B revlog $BMWAG$O#1$D$G$O$J$/#2$D$N?F$N>pJs$rJ];}$G$-$^$9!#(B 1.281 +Mercurial $B$O(B``$B6u<1JL;R(B''$B!J(Bnull ID$B!K$H8F$P$l$kFCJL$J%O%C%7%eCM$r;H$C$F!"(B 1.282 +``$B?FIT:_(B''$B$rI=8=$7$^$9(B\footnote{$BLuCm(B: 1.283 +$B$D$^$j!"B?$/$N(B revlog $BMWAG$O!"(B 1.284 +$B0lJ}$N?F%j%S%8%g%s$H$7$F6u(BID$B$rJ];}$7$F$$$^$9!#(B}$B!#(B 1.285 +$B$3$N%O%C%7%eCM$OC1=c$K(B0$B$,O"B3$7$?J8;zNs$G$9!#(B 1.286 + 1.287 +revlog $B$N35G0?^$r?^(B~\ref{fig:concepts:revlog}$B$K8+$k$3$H$,$G$-$^$9!#(B 1.288 +filelog $B$d(B manifest$B!"(Bchangelog $B$NA4$F$,F1$89=B$$r;}$C$F$*$j!"(B 1.289 +$B8D!9$NMWAG$,J];}$7$F$$$k!"(B 1.290 +$B:9J,$d%9%J%C%W%7%g%C%H$H$$$C$?%G!<%?$N<oJL$,0[$J$k$@$1$G$9!#(B 1.291 + 1.292 +revlog $B$K$*$1$k:G=i$N%j%S%8%g%s(B 1.293 +$B!J?^$K$*$1$kDl0LCV$N%j%S%8%g%s!K$O!"(B 1.294 +$B#2$D$N?F%j%S%8%g%s3JG<NN0h$NN>J}$K6u<1JL;R$rJ];}$7$F$$$^$9!#(B 1.295 +``$BDL>o$N(B''$B%j%S%8%g%s$G$O!"(B 1.296 +$BBh#1?F$N3JG<NN0h$K$O?F%j%S%8%g%s$N<1JL;R$,!"(B 1.297 +$BBh#2?F$N3JG<NN0h$K$O6u<1JL;R$,3JG<$5$l!"(B 1.298 +$B?F%j%S%8%g%s$,#1$D$7$+$J$$$3$H$rI=$7$^$9!#(B 1.299 +$B?F%j%S%8%g%s$N<1JL;R$H$7$FF1$8<1JL;R$r3JG<$9$k%j%S%8%g%sF1;N$O!"(B 1.300 +$B8_$$$K%V%i%s%A$H$J$j$^$9!#(B 1.301 +$B%V%i%s%A$r%^!<%8$7$?%j%S%8%g%s$O!"(B 1.302 +$BE}9g$5$l$?N>J}$N%j%S%8%g%s$N<1JL;R$r?F%j%S%8%g%s$N<1JL;R$H$7$F3JG<$7$^$9!#(B 1.303 + 1.304 +\begin{figure}[ht] 1.305 + \centering 1.306 + \grafix{revlog} 1.307 + \caption{} 1.308 + \label{fig:concepts:revlog} 1.309 +\end{figure} 1.310 + 1.311 +\section{The working directory} 1.312 + 1.313 +Mercurial $B$O!"(B 1.314 +$B%j%]%8%H%j$G9=@.4IM}$5$l$F$$$k%U%!%$%k$N!"(B 1.315 +$BFCDj$N%j%S%8%g%s$K$*$1$k%9%J%C%W%7%g%C%H$r:n6HNN0h%G%#%l%/%H%j$KJ];}$7$^$9!#(B 1.316 + 1.317 +$B:n6HNN0h%G%#%l%/%H%j$O!"(B 1.318 +$B$I$N%j%S%8%g%s$N%9%J%C%W%7%g%C%H$rJ];}$7$F$$$k$N$+$r(B``$BCN$C$F$$$^$9(B''$B!#(B 1.319 +$B:n6HNN0h%G%#%l%/%H%j$rFCDj$N%j%S%8%g%s$G99?7$7$h$&$H$7$?>l9g!"(B 1.320 +Mercurial $B$O(B (1) $BAj1~$7$$%j%S%8%g%s$N(B manifest $B$r;2>H$7!"(B 1.321 +(2) $BEv3:%j%S%8%g%s$N%3%_%C%H;~E@$G$N4IM}BP>]%U%!%$%k$rFCDj$7!"(B 1.322 +(3) $B:n6HNN0h%G%#%l%/%H%jCf$N%U%!%$%k$,J];}$9$Y$-FbMF$r7hDj$7$^$9!#(B 1.323 +$B$=$N>e$G!"(B 1.324 +$BEv3:%A%'%s%8%;%C%H$N%3%_%C%H;~E@$HF1$8FbMF$r;}$D$h$&$K!"(B 1.325 +$B:n6HNN0h%G%#%l%/%H%jCf$K3F%U%!%$%k$NJ#@=$r:F@8@.$7$^$9!#(B 1.326 + 1.327 +dirstate $B7A<0$K$O!"(B 1.328 +$B:n6HNN0h%G%#%l%/%H%j$,$I$N%A%'%s%8%;%C%H$G99?7$5$l$F$$$k$+$H$+!"(B 1.329 +$B:n6HNN0h$G(B Mercurial $B$K$h$j9=@.4IM}$5$l$F$$$k%U%!%$%k$N0lMw$J$I!"(B 1.330 +$B:n6HNN0h%G%#%l%/%H%j$K4X$9$k(B 1.331 +Mercurial $B$N4IM}>pJs$,3JG<$5$l$F$$$^$9!#(B 1.332 + 1.333 +$B8D!9$N%j%S%8%g%s$K4X$9$k(B revlog $BMWAG$O!"(B 1.334 +$B#2$D$N?F%j%S%8%g%s<1JL;R$r3JG<$9$kNN0h$r;}$C$F$$$^$9$N$G!"(B 1.335 +$BDL>o$N%j%S%8%g%s!J#1$D$N?F%j%S%8%g%s$@$1$r;2>H!K$b!"(B 1.336 +$B#2$D$N%j%S%8%g%s$r%^!<%8$9$k%j%S%8%g%s$bI=8=2DG=$G$9$,!"(B 1.337 +dirstate $B7A<0$b#2$D$N?F%j%S%8%g%s<1JL;R$r3JG<$9$kNN0h$r;}$C$F$$$^$9!#(B 1.338 +\hgcmd{update} $B%3%^%s%I$r<B9T$7$?:]$K$O!"(B 1.339 +$B;XDj$7$?%A%'%s%8%;%C%H$O(B``$BBh#1?F(B''$B!J(Bfirst parent$B!K$H$7$FJ];}$5$l!"(B 1.340 +$BBh#2?F$O6u<1JL;R$rJ];}$7$^$9!#(B 1.341 +$B%A%'%s%8%;%C%H$H$N(B \hgcmd{merge} $B$r9T$C$?:]$K$O!"(B 1.342 +dirstate $B7A<0$,J];}$9$kBh#1?F$OJQ2=$7$^$;$s$,!"(B 1.343 +$BBh#2?F$O(B \hgcmd{merge} $B%3%^%s%I$K;XDj$5$l$?%A%'%s%8%;%C%H$K@_Dj$5$l$^$9!#(B 1.344 +\hgcmd{parents} $B%3%^%s%I$K$h$j!"(B 1.345 +dirstate $B7A<0$,J];}$9$k?F%j%S%8%g%s$N<1JL;R$rI=<($G$-$^$9!#(B 1.346 + 1.347 +\subsection{What happens when you commit} 1.348 + 1.349 +dirstate $B7A<0$,?F%j%S%8%g%s>pJs$rJ];}$9$k$N$O!"(B 1.350 +$B2?$b3P$(=q$-$N$?$a$@$1$G$O$"$j$^$;$s!#(B 1.351 +Mercurial $B$O(B dirstate $B7A<0$N;}$D?F%j%S%8%g%s>pJs$r!"(B 1.352 +$B%3%_%C%H$N:]$N(B\emph{$B?75,%A%'%s%8%;%C%H$N?F%A%'%s%8%;%C%H(B}$B$H$7$F;HMQ$7$^$9!#(B 1.353 + 1.354 +\begin{figure}[ht] 1.355 + \centering 1.356 + \grafix{wdir} 1.357 + \caption{The working directory can have two parents} 1.358 + \label{fig:concepts:wdir} 1.359 +\end{figure} 1.360 + 1.361 +$B?^(B~\ref{fig:concepts:wdir}$B$O!"(B 1.362 +$B#1$D$N?F%A%'%s%8%;%C%H$N$_$r;}$D!"(B 1.363 +$BDL>o$N:n6HNN0h%G%#%l%/%H%j$rI=$7$F$$$^$9!#(B 1.364 +$B?^$K$*$1$k:n6HNN0h%G%#%l%/%H%j$N?F%A%'%s%8%;%C%H$O!"(B 1.365 +$B%j%]%8%H%j$K$*$1$k:G?7$G3n$D;R$r;}$?$J$$%A%'%s%8%;%C%H$G$9$N$G!"(B 1.366 +\emph{tip} $B$H8F$P$l$^$9!#(B 1.367 + 1.368 +\begin{figure}[ht] 1.369 + \centering 1.370 + \grafix{wdir-after-commit} 1.371 + \caption{The working directory gains new parents after a commit} 1.372 + \label{fig:concepts:wdir-after-commit} 1.373 +\end{figure} 1.374 + 1.375 +$B:n6HNN0h%G%#%l%/%H%j$=$N$b$N$r!"(B 1.376 +``$B%3%_%C%H$7$h$&$H$7$F$$$k%A%'%s%8%;%C%H(B'' 1.377 +$B$HB*$($k$H$o$+$j$d$9$$$G$7$g$&!#(B 1.378 +Mercurial $B$KBP$7$FDI2C!?:o=|!?2~L>$J$$$7J#@=$r;X<($7$?%U%!%$%k$O!"(B 1.379 +$B4{$K(B Mercurial $B$K$h$j9=@.4IM}$5$l$F$$$k%U%!%$%k$X$NJQ99$HF1MM$K!"(B 1.380 +$B$=$N%A%'%s%8%;%C%H$KH?1G$5$l$^$9!#(B 1.381 +$B$=$N?7$?$J%A%'%s%8%;%C%H$K$O!"(B 1.382 +$B:n6HNN0h%G%#%l%/%H%j$HF1$8?F%A%'%s%8%;%C%H$,@_Dj$5$l$^$9!#(B 1.383 + 1.384 +$B%3%_%C%H$,40N;$7$?$J$i!"(B 1.385 +Mercurial $B$d:n6HNN0h%G%#%l%/%H%j$N?F%A%'%s%8%;%C%H$N>pJs$r99?7$7$^$9!#(B 1.386 +$BBh#1?F$K$O%3%_%C%H$K$h$j?7$?$K@8@.$5$l$?%A%'%s%8%;%C%H$N<1JL;R$,@_Dj$5$l!"(B 1.387 +$BBh#2?F$K$O6u<1JL;R$,@_Dj$5$l$^$9!#(B 1.388 +$B%3%_%C%H8e$NLO<0?^$r!"(B 1.389 +$B?^(B~\ref{fig:concepts:wdir-after-commit}$B$K<($7$^$9!#(B 1.390 +Mercurial $B$O%3%_%C%H$N:]$K!"(B 1.391 +$B:n6HNN0h%G%#%l%/%H%jCf$N%U%!%$%k$K$O0l@Z?($l$:!"(B 1.392 +$BC1$K(B dirstate $B$N?F%A%'%s%8%;%C%H>pJs$r=q$-49$($k$@$1$G$9!#(B 1.393 + 1.394 +\subsection{Creating a new head} 1.395 + 1.396 +$B8=;~E@$G$N(B tip $B0J30$N%A%'%s%8%;%C%H$G$N:n6HNN0h%G%#%l%/%H%j$N99?7$O!"(B 1.397 +$BNI$/$"$k$3$H$G$9!#(B 1.398 +$BNc$($P!"(B 1.399 +$B@h=52PMKF|;~E@$G$N%W%m%8%'%/%H$N>uBV$rD4$Y$?$j!"(B 1.400 +$B$I$N%A%'%s%8%;%C%H$,%P%0$r;}$A9~$s$@$N$+$rD4$Y$k!"(B 1.401 +$B$H$$$C$?>u67$G$9!#(B 1.402 +$B$3$N$h$&$J>u67$G$N<+A3$J9T0Y$O!"(B 1.403 +$B:n6HNN0h%G%#%l%/%H%j$r4uK>$N%A%'%s%8%;%C%H$G99?7$7!"(B 1.404 +$BEv3:%A%'%s%8%;%C%H$r%3%_%C%H$7$?;~E@$G$N%U%!%$%k$NFbMF$r!"(B 1.405 +$B:n6HNN0h%G%#%l%/%H%jCf$N%U%!%$%k$r;2>H$7$F3NG'$9$k!"(B 1.406 +$B$H$$$&$b$N$G$7$g$&!#(B 1.407 +$B$3$N9T0Y$K$h$k1F6A$r!"(B 1.408 +$B?^(B~\ref{fig:concepts:wdir-pre-branch}$B$K<($7$^$9!#(B 1.409 + 1.410 +\begin{figure}[ht] 1.411 + \centering 1.412 + \grafix{wdir-pre-branch} 1.413 + \caption{The working directory, updated to an older changeset} 1.414 + \label{fig:concepts:wdir-pre-branch} 1.415 +\end{figure} 1.416 + 1.417 +$B:n6HNN0h%G%#%l%/%H%j$r0JA0$N%A%'%s%8%;%C%H$G99?7$7$?>l9g!"(B 1.418 +$B2?$i$+$NJQ99$r9T$C$F%3%_%C%H$7$?$J$i!"(B 1.419 +Mercurial $B$O$I$N$h$&$K?6Iq$&$N$G$7$g$&$+!)(B 1.420 +Mercurial $B$O$3$l$^$G$K@bL@$7$F$-$?>l9g$HF1$8$h$&$K?6Iq$$$^$9!#(B 1.421 +$B:n6HNN0h%G%#%l%/%H%j$N?F%A%'%s%8%;%C%H$,!"(B 1.422 +$B?75,$K:n@.$5$l$k%A%'%s%8%;%C%H$N?F$K$J$j$^$9!#(B 1.423 +$B?75,:n@.$5$l$k%A%'%s%8%;%C%H$O;R$r;}$?$:!"(B 1.424 +$B$h$C$F?7$?$J(B tip $B%A%'%s%8%;%C%H$H$J$j$^$9!#(B 1.425 +$B%3%_%C%H$N7k2L!"(B 1.426 +$B%j%]%8%H%j$K$O;R$r;}$?$J$$%A%'%s%8%;%C%H$,#2$DB8:_$7!"(B 1.427 +$B$3$l$i$O(B \emph{head} $B$H8F$P$l$^$9!#(B 1.428 +$B$3$N>u67$r?^(B~\ref{fig:concepts:wdir-branch} $B$K<($7$^$9!#(B 1.429 + 1.430 +\begin{figure}[ht] 1.431 + \centering 1.432 + \grafix{wdir-branch} 1.433 + \caption{After a commit made while synced to an older changeset} 1.434 + \label{fig:concepts:wdir-branch} 1.435 +\end{figure} 1.436 + 1.437 +\begin{note} 1.438 + Mercurial $B$KFk@w$_$NL5$$J}$O!"(B 1.439 + $B0z?tL5$7$G(B \hgcmd{pull} $B%3%^%s%I$r<B9T$7$?>l9g$N!"(B 1.440 + $BNI$/$"$k!V4V0c$$!W$r5$$KN1$a$FCV$$$F$/$@$5$$!#(B 1.441 + \hgcmd{pull} $B%3%^%s%I$N4pDlF0:n$O!"(B 1.442 + $B:n6HNN0h%G%#%l%/%H%j$N99?7$r(B\emph{$B9T$$$^$;$s(B}$B$N$G!"(B 1.443 + $B%j%]%8%H%j$X$N?75,%A%'%s%8%;%C%H$N<h$j9~$_$O9T$o$l$F$b!"(B 1.444 + $B:n6HNN0h%G%#%l%/%H%j$O(B \hgcmd{pull} $B%3%^%s%I<B9TA0$N$^$^$G$9!#(B 1.445 + $B:n6HNN0h%G%#%l%/%H%j$OEv3:;~E@$G$N(B tip $B$HF14|$7$F$$$J$$$?$a!"(B 1.446 + \hgcmd{pull} $B$N<B9T8e$K2?$i$+$NJQ99$r9T$$%3%_%C%H$7$?>l9g!"(B 1.447 + $B7k2L$H$7$F?7$?$J(B head $B$r@8@.$9$k$3$H$K$J$j$^$9!#(B 1.448 + 1.449 + $B3g8LIU$-$G!V4V0c$$!W$H=R$Y$?$N$O!"(B 1.450 + $B$3$N>u67$r=$I|$9$k$N$KI,MW$J$3$H$,!"(B 1.451 + \hgcmd{merge} $B$7$F$+$i(B \hgcmd{commit} $B$9$l$PNI$$$@$1$@$+$i$G$9!#(B 1.452 + $B8@$$49$($k$J$i!"(B 1.453 + $B$3$N$h$&$J%1!<%9$OA4A3?<9o$J>u67$G$O$J$$!"$H$$$&$3$H$G$9!#(B 1.454 + Mercurial $B$K47$l$F$$$J$$?M$O%S%C%/%j$9$k$+$b$7$l$^$;$s$,!D!#(B 1.455 + $B$3$N$h$&$J;vBV$r2sHr$9$kJL$NJ}K!$d!"(B 1.456 + $B=i?4<T$K$H$C$F0U30$K46$8$k$3$N$h$&$J?6$kIq$$$r(B Mercurial $B$,$H$kM}M3$K$D$$$F!"(B 1.457 + $B8e$[$I@bL@$7$?$$$H;W$$$^$9!#(B 1.458 +\end{note} 1.459 + 1.460 +\subsection{Merging heads} 1.461 + 1.462 +\hgcmd{merge} $B%3%^%s%I<B9T$N:]$K!"(B 1.463 +Mercurial $B$O:n6HNN0h%G%#%l%/%H%j$NBh#1?F$OJQ99$;$:$K!"(B 1.464 +$BBh#2?F$r%^!<%8BP>]$H$7$F;XDj$7$?%A%'%s%8%;%C%H$KJQ99$7$^$9!#(B 1.465 +$B$3$NMM;R$r?^(B~\ref{fig:concepts:wdir-merge}$B$K<($7$^$9!#(B 1.466 + 1.467 +\begin{figure}[ht] 1.468 + \centering 1.469 + \grafix{wdir-merge} 1.470 + \caption{Merging two heads} 1.471 + \label{fig:concepts:wdir-merge} 1.472 +\end{figure} 1.473 + 1.474 +$B#2$D$N%A%'%s%8%;%C%H$K$*$$$F4IM}$5$l$k%U%!%$%k$r%^!<%8$9$k$?$a!"(B 1.475 +Mercurial $B$O:n6HNN0h%G%#%l%/%H%j$rJQ99$7$^$9!#(B 1.476 +$BB?>/4JJX2=$7$F@bL@$9$k$H!"(B 1.477 +$BN>J}$N%A%'%s%8%;%C%H$N(B manifest $B$K4^$^$l$kA4$F$N%U%!%$%k$KBP$7$F!"(B 1.478 +$B35$M0J2<$N$h$&$K%^!<%8=hM}$,<B;\$5$l$^$9!#(B 1.479 + 1.480 +\begin{itemize} 1.481 +\item $B$I$A$i$N%A%'%s%8%;%C%H$G$b%U%!%$%k$rJQ99$7$F$$$J$$>l9g!"(B 1.482 + $B$=$N%U%!%$%k$KBP$7$F$O2?$b9T$o$l$^$;$s!#(B 1.483 + 1.484 +\item $B0lJ}$N%A%'%s%8%;%C%H$,JQ99$7$F$$$k%U%!%$%k$r!"(B 1.485 + $BB>J}$,JQ99$7$F$$$J$$>l9g!"(B 1.486 + $BJQ99FbMF$rH?1G$7$?%U%!%$%k$r:n6HNN0h%G%#%l%/%H%j$KJ#@=$7$^$9!#(B 1.487 + 1.488 +\item $B0lJ}$N%A%'%s%8%;%C%H$,:o=|$7$?%U%!%$%k$O!"(B 1.489 + $BB>J}$N:o=|$K4X$o$i$:!"(B 1.490 + $B:n6HNN0h%G%#%l%/%H%j$+$i:o=|$5$l$^$9!#(B 1.491 + 1.492 +\item $B0lJ}$N%A%'%s%8%;%C%H$,:o=|$7$?%U%!%$%k$r!"(B 1.493 + $BB>J}$,JQ99$7$F$$$?>l9g!"(B 1.494 + $B%U%!%$%k$NJQ99$H:o=|$N$I$A$i$r:NMQ$9$k$N$+!"(B 1.495 + $B%f!<%6$KBP$7$FLd$$9g$o$;$^$9!#(B 1.496 + 1.497 +\item $BN>J}$N%A%'%s%8%;%C%H$,%U%!%$%k$rJQ99$7$F$$$k>l9g!"(B 1.498 + $BFbMF$N%^!<%87k2L$r%U%!%$%k$KJ]B8$9$k$?$a$K!"(B 1.499 + $B30It%^!<%8%W%m%0%i%`$,5/F0$5$l$^$9!#(B 1.500 + $B$3$N>l9g!"%f!<%6$K$h$kBPOCE*A`:n$,I,MW$K$J$k$+$b$7$l$^$;$s!#(B 1.501 + 1.502 +\item $B0lJ}$N%A%'%s%8%;%C%H$,JQ99$7$F$$$k%U%!%$%k$r!"(B 1.503 + $BB>J}$,2~L>$7$?$jJ#@=$7$?$j$7$F$$$k>l9g!"(B 1.504 + $BJQ99FbMF$,?7$7$$%U%!%$%k$K$bEAGE$9$k$h$&$K$7$^$9!#(B 1.505 + 1.506 +\end{itemize} 1.507 + 1.508 +$BB>$K$b:Y$+$$OC(B---$BFC$K%^!<%8$K4X$7$F$O:Y$+$$OC$,Bt;3$"$j$^$9(B---$B$,$"$j$^$9$,!"(B 1.509 +$B%^!<%8$K4XO"$9$k0lHLE*$J?6$kIq$$$N<oN`$O$3$NDxEY$G$9!#(B 1.510 +$B$4Mw$NMM$K!"KX$I$N>u67$,A4$/<+F0E*$K=hM}$5$l$^$9$7!"(B 1.511 +$B<B:]$N%^!<%8$G$bKX$I$N>l9g!"(B 1.512 +$B>WFM2r>C$N$?$a$NBPOCE*$JF~NOL5$7$K<+F0E*$K40N;$7$^$9!#(B 1.513 + 1.514 +$B%^!<%88e$N%3%_%C%H$N:]$K=hM}$5$l$k;vJA$r9M$($k>l9g$O!"(B 1.515 +$B@h$K$b=R$Y$^$7$?$,!"(B 1.516 +$B:n6HNN0h%G%#%l%/%H%j$r(B 1.517 +``$B%3%_%C%H$7$h$&$H$7$F$$$k%A%'%s%8%;%C%H(B'' 1.518 +$B$HB*$($k$H$o$+$j$d$9$$$G$7$g$&!#(B 1.519 +\hgcmd{merge} $B%3%^%s%I$,40N;$7$?8e$N:n6HNN0h%G%#%l%/%H%j$O!"(B 1.520 +$B?F%A%'%s%8%;%C%H$r#2$D;}$A!"(B 1.521 +$B%3%_%C%H$K$h$C$F@8@.$5$l$k?7$?$J%A%'%s%8%;%C%H$O!"(B 1.522 +$B$3$l$i$r?F%A%'%s%8%;%C%H$H$7$^$9!#(B 1.523 + 1.524 +Mercurial $B$G$O7+$jJV$7%^!<%8$9$k$3$H$,2DG=$G$9$,!"(B 1.525 +Mercurial $B$O$j%S%8%g%s$*$h$S:n6HNN0h%G%#%l%/%H%j$NN>J}$KBP$7$F!"(B 1.526 +$B0lEY$K#2$D$N?F%j%S%8%g%s$7$+DI@W$G$-$J$$$?$a!"(B 1.527 +$B8D!9$N%^!<%8$NETEY%3%_%C%H$9$kI,MW$,$"$j$^$9!#(B 1.528 +$BJ#?t$N%A%'%s%8%;%C%H$N0l3g%^!<%8$O5;=QE*$K$O2DG=$G$7$g$&$,!"(B 1.529 +$B%f!<%6$,:.Mp$7$?$j!"(B 1.530 +$B$R$I$/Mp;($J%^!<%8$,9T$o$l$k$G$"$m$&$3$H$OL\$K8+$($F$$$^$9!#(B 1.531 + 1.532 +\section{Other interesting design features} 1.533 + 1.534 +$B$3$l$^$G$N@a$G!"(B 1.535 +Mercurial $B$,?.Mj@-$H@-G=$XCm0U?<$/G[N8$rJ'$C$F$$$k$3$H$r@bL@$9$k$?$a$K!"(B 1.536 +$B@_7W$K$*$1$k:G$b=EMW$JB&LL$N4v$D$+$K>GE@$rEv$F$F$-$^$7$?!#(B 1.537 +$B$7$+$7!"(B 1.538 +$B>\:Y;v9`$X$NG[N8$O!"(B 1.539 +$B$3$l$@$1$KN1$^$j$^$;$s!#(B 1.540 +Mercurial $B$N9=@.$K$*$$$FI.<T$N8D?ME*$J6=L#$r$=$=$kB&LL$,B??t$"$j$^$9!#(B 1.541 +$B$3$l$^$G$N(B``big ticket''$B$JB&LL$H$OJL$K!"(B 1.542 +$B$$$/$D$+$rA*$s$G>\:Y$r@bL@$7$h$&$H;W$$$^$9$N$G!"(B 1.543 +$B$3$l$i$K6=L#$,$"$l$P!"(B 1.544 +$BNI$$@_7W$N%7%9%F%`$N9M0F$N:]$KM-MQ$J!"(B 1.545 +$B$h$jNI$$H/A[$rF@$k$3$H$,$G$-$k$G$7$g$&!#(B 1.546 + 1.547 +\subsection{Clever compression} 1.548 + 1.549 +Mercurial $B$O%9%J%C%W%7%g%C%H$H:9J,$N$=$l$>$l$KBP$7$F!"(B 1.550 +$B05=L$,M-8z$G$"$k>l9g$K$O05=L7A<0$GJ]B8$7$^$9!#(B 1.551 +Mercurial $B$O>o$K%9%J%C%W%7%g%C%H$J$$$7:9J,$N05=L$r(B\emph{$B;n9T(B}$B$7$^$9$,!"(B 1.552 +$BHs05=L$J>uBV$h$j$b%5%$%:$,>.$5$$>l9g$K8B$j!"(B 1.553 +$B05=L7A<0$G$NJ]B8$r9T$$$^$9!#(B 1.554 + 1.555 +$B$3$N$3$H$O!"(B 1.556 +$BNc$($P(B \texttt{zip} $B%"!<%+%$%V$d(B JPEG $B2hA|$N$h$&$K!"(B 1.557 +$B85!905=L7A<0$NFbMF$r;}$D%U%!%$%k$N3JG<$N:]$K!"(B 1.558 +Mercurial $B$,(B``$BE,@Z$J=hCV(B''$B$r9T$&$3$H0UL#$7$^$9!#(B 1.559 +$B$3$l$i$N%U%!%$%k$O(B Mercurial $B$K$h$k#2EYL\$N05=L$N:]$K$O!"(B 1.560 +$B:G=i$N%5%$%:$h$j$bBg$-$/$J$k$N$,0lHLE*$G$9$N$G!"(B 1.561 +Mercurial $B$O(B \texttt{zip} $B$d(B JPEG $B%U%!%$%k$r$=$N$^$^J]B8$7$^$9!#(B 1.562 + 1.563 +$B05=L7A<0$N%U%!%$%k$N%j%S%8%g%s4V$N:9J,$O!"(B 1.564 +$B0lHLE*$K$O%9%J%C%W%7%g%C%H$h$j$bBg$-$/$J$j$^$9$N$G!"(B 1.565 +$B$3$N>l9g$G$b(B Mercurial $B$O(B``$BE,@Z$J=hCV(B''$B$r9T$$$^$9!#(B 1.566 +$B%U%!%$%k$N%9%J%C%W%7%g%C%H$=$N$b$N$rJ]B8$9$k>l9g$N5vMFHO0O$r!"(B 1.567 +$B:9J,>pJs$N%5%$%:$,D6$($k$3$H$,H=L@$7$?>l9g!"(B 1.568 +Mercurial $B$O%9%J%C%W%7%g%C%H$rJ]B8$7$^$9$N$G!"(B 1.569 +$B7+$jJV$7$K$J$j$^$9$,!"(B 1.570 +$B:9J,$N$_$rJ];}$9$k%b%G%k$h$j$b%G%#%9%/MFNL$,@aLs$G$-$^$9!#(B 1.571 + 1.572 +\subsubsection{Network recompression} 1.573 + 1.574 +Mercurial $B$O%G%#%9%/$X$NMzNrJ]B8$N:]$K!"(B 1.575 +$B@-G=$KBP$9$k05=LN($,$=$3$=$3NI9%$G%P%i%s%9$N<h$l$F$$$k(B``$B<}=L(B'' 1.576 +$B!J(Bdeflate$B!K05=L%"%k%4%j%:%`(B 1.577 +$B!JCxL>$J(B \texttt{zip} $B%"!<%+%$%V7A<0$,F1Ey$N$b$N$r;HMQ$7$F$$$^$9!K(B 1.578 +$B$r;HMQ$7$F$$$^$9!#(B 1.579 +$B$7$+$7!"(B 1.580 +$B%M%C%H%o!<%/1[$7$N%G!<%?E>Aw$N:]$K$O!"(B 1.581 +Mercurial $B$OMzNr%G!<%?$r05=L$7$^$;$s!#(B 1.582 + 1.583 +$B%M%C%H%o!<%/@\B3$,(B HTTP $B7PM3$N>l9g!"(B 1.584 +Mercurial $B$O%G!<%?DL?.$N7PO)A4BN$r!"(B 1.585 +$B$h$jNI$$05=LN($rF@$i$l$k05=L%"%k%4%j%:%`(B 1.586 +$B!J(B\texttt{bzip2} $B05=L$H$7$F9-$/;HMQ$5$l$F$$$k(B 1.587 +Burrows-Wheeler $B%"%k%4%j%:%`!K$G:F05=L$7$^$9!#(B 1.588 +$B%j%S%8%g%s>pJs8DJL$N05=L$G$O$J$/!"(B 1.589 +\texttt{bzip2} $B%"%k%4%j%:%`$HDL?.7PO)A4BN$N05=L$H$$$&AH$_9g$o$;$K$9$k$3$H$G!"(B 1.590 +$BE>Aw%G!<%?NL$rBgI}$KDc8:$9$k$3$H$,$G$-$^$9$N$G!"(B 1.591 +$BKX$IA4$F$N%M%C%H%o!<%/7ABV$K$*$$$FNI9%$J@-G=$rH/4x$G$-$^$9!#(B 1.592 + 1.593 +$B!J(B\command{ssh} $B$G$N@\B3$N>l9g!"(B 1.594 +\command{ssh} $B<+?H$,05=L$r9T$&$3$H$,$G$-$k$N$G!"(B 1.595 +Mercurial $B$O@\B37PO)$N:F05=L$r(B\emph{$B9T$$$^$;$s(B} 1.596 +\footnote{$BLuCm(B: $BLu<T$N7P83$G$O!"(B 1.597 +$B%5!<%PB&$N(B Python $B$,(B zlib $B$r;HMQ$G$-$J$$>l9g!"(B 1.598 +ssh $B$G$N(B push/pull $B$,5!G=$7$J$+$C$?$N$G!"(B 1.599 +Mercurial $B$N%5%$%H$K$bF1MM$N5-=R$,$"$j$^$9$,!"(B 1.600 +$B$3$N5-=R$O>/!9DTjm$,9g$o$J$$5$$,$7$^$9!#(B}$B!K(B 1.601 + 1.602 +\subsection{Read/write ordering and atomicity} 1.603 + 1.604 +$BIT40A4$J=q$-9~$_FbMF$,MxMQ$5$l$k$3$H$N$J$$$h$&$KJ]>Z$9$k>e$G$O!"(B 1.605 +$B%U%!%$%k$X$NDI2C=q$-9~$_$@$1$,A4$F$G$O$"$j$^$;$s!#(B 1.606 +$B$b$&0lEY!"?^(B~\ref{fig:concepts:metadata}$B$r8+$F$$$?$@$1$l$P$o$+$k$h$&$K!"(B 1.607 +changelog $BCf$N%j%S%8%g%sMWAG$O(B manifest $BCf$N%j%S%8%g%sMWAG$r!"(B 1.608 +manifest $BCf$N%j%S%8%g%sMWAG$O(B filelog $BCf$N%j%S%8%g%sMWAG$r;X$7$F$$$^$9!#(B 1.609 +$B$3$N3,AX9=B$$O0U?^E*$J$b$N$J$N$G$9!#(B 1.610 + 1.611 +$B%G!<%?=q$-9~$_$N:]$K$O!"(B 1.612 +filelog $B$*$h$S(B manifest $B$X$N=q$-9~$_$G%H%i%s%6%/%7%g%s$,3+;O$5$l!"(B 1.613 +$B$3$l$i$X$N=q$-9~$_$,40N;$9$k$^$G$O(B 1.614 +changelog $B$X$N=q$-9~$_$O9T$o$l$^$;$s!#(B 1.615 +$BFI$_9~$_$N:]$K$O!"(B 1.616 +changelog $B$r5/E@$H$7$F(B manifest$B!"(Bfilelog $B$N=g=x$GFI$_9~$_$r9T$$$^$9!#(B 1.617 + 1.618 +changelog $B$X$N=q$-9~$_$K@hN)$C$F!"(B 1.619 +$B>o$K(B filelog $B$*$h$S(B manifest $B$X$N=q$-9~$_$,40N;$7$F$$$k$N$G!"(B 1.620 +changelog $B$+$i$NIT40A4$J(B manifest $B$X$N;2>H$rFI$_9~$`$3$H$b!"(B 1.621 +manifest $B$+$i$NIT40A4$J(B filelog $B$X$N;2>H$rFI$_9~$`$3$H$b$"$j$^$;$s!#(B 1.622 + 1.623 +\subsection{Concurrent access} 1.624 + 1.625 +$BFI$_=q$-<j=g$HIT2DJ,@-J]>Z$K$h$j!"(B 1.626 +$BNc$(FI$_9~$_$N:GCf$K=q$-9~$_$,9T$o$l$k$H$7$F$b!"(B 1.627 +Mercurial $B$OFI$_9~$_$K$*$1$k%j%]%8%H%j$N(B\emph{$BGSB>(B}$B$rI,MW$H$7$^$;$s!#(B 1.628 +$B$3$NFC@-$OBg5,LO2=$N:]$KHs>o$K1F6A$,$"$j$^$9!#(B 1.629 +$BG$0U$N?t$N(B Mercurial $B%W%m%;%9$,!"(B 1.630 +$B=q$-=P$7%W%m%;%9$NM-L5$K4X$o$i$:!"(B 1.631 +$B%j%]%8%H%j$KBP$7$FF1;~FI$_=P$7$r0BA4$K9T$&$3$H$,$G$-$^$9!#(B 1.632 + 1.633 +$BFI$_=P$7$K$*$1$kGSB>ITMW$NFC@-$O!"(B 1.634 +$BB?%f!<%6%7%9%F%`>e$G%j%]%8%H%j$r8x3+$7$F$$$k:]$K!"(B 1.635 +$BJ#@=!J(B\hgcmd{clone}$B!K$dJQ99$N<h$j9~$_!J(B\hgcmd{pull}$B!K$N$?$a$K!"(B 1.636 +$BB>$N%f!<%6$K!J$"$J$?$N!K(B 1.637 +$B%j%]%8%H%j$X$N(B\emph{$B=q$-9~$_(B}$B$r5v2D$9$kI,MW(B\footnote{$BLuCm(B: 1.638 +$B%W%m%;%94V$GGSB>$r9T$&>l9g!"(B 1.639 +$BGSB>MQ$N%U%!%$%k$rMQ$$$k$+!"(B 1.640 +$B%G%#%l%/%H%j$=$N$b$N$KGSB>@_Dj$r9T$&$N$,0lHLE*$G$9$,!"(B 1.641 +$B$=$N$?$a$K$O=q$-9~$_8"8B$,I,MW$G$9!#(B} 1.642 +$B$,L5$$$3$H$r0UL#$7$^$9!#(B 1.643 +$BFI$_=P$7$r9T$&B>$N%f!<%6$K$O!"(B 1.644 +\emph{$BFI$_=P$7(B}$B8"8B$N$_$N8x3+$G:Q$_$^$9(B 1.645 +$B!J$3$N@-<A$O9=@.4IM}%7%9%F%`$K6&DL$NFC@-$G$O(B\emph{$B$"$j$^$;$s(B}$B$N$G!"(B 1.646 +$B0lHLE*$J$b$N$@$H$O;W$o$J$$$G$/$@$5$$!#(B 1.647 +$BB?$/$N9=@.4IM}%7%9%F%`$G$O!"(B 1.648 +$BFI$_=P$7%f!<%6$G$"$C$F$b!"(B 1.649 +$B0BA4$JFI$_=P$7$N$?$a$K$O%j%]%8%H%j$rGSB>$9$k8"8B$,I,MW$G$"$j!"(B 1.650 +$B$=$N$?$a$K$O:GDc$G$b#1$D$N%G%#%l%/%H%j$KBP$9$k=q$-9~$_8"8B$,I,MW$J$?$a!"(B 1.651 +$B0BA4@-$H4IM}>e$GLLE]$JLdBj$N860x$H$J$jF@$^$9!#!K!#(B 1.652 + 1.653 +Mercurial $B$,GSB>$r9T$&$N$O!"(B 1.654 +$B0lEY$K#1$D$N%W%m%;%9$N$_$,%j%]%8%H%j$K=q$-9~$`$N$rJ]>Z>l9g$@$1$G$9(B 1.655 +$B!JGSB>$KE,$5$J$$$H8@$o$l$k(B NFS $B$N$h$&$J%U%!%$%k%7%9%F%`(B\footnote{$BLuCm(B: 1.656 +$B9=@.4IM}%7%9%F%`$K8B$i$:!"(B 1.657 +$BGSB>$N<B8=$K(B <code>creat(EXCL)</code> 1.658 +$B$G@8@.$5$l$k%U%!%$%k$r;HMQ$7$F$$$k$?$a$K!"(B 1.659 +NFS $B$G$OE,@Z$KGSB>$G$-$J$$%W%m%0%i%`$,B??tB8:_$7$^$9!#(B 1.660 +}$B$G$"$C$F$b!"(B 1.661 +$B0BA4$KGSB>$G$-$k;EAH$_$rMQ$$$F$$$^$9!K!#(B 1.662 +$B%j%]%8%H%j$,B>$N%W%m%;%9$K$h$jGSB>$5$l$F$$$k>l9g!"(B 1.663 +$B=q$-9~$_$r9T$&%W%m%;%9$O!"(B 1.664 +$B%j%]%8%H%j$NGSB>$,2r=|$5$l$k$^$G;C$/BT$C$F:FEYGSB>$r;n9T$7$^$9$,!"(B 1.665 +$BD9;~4V$KEO$C$FGSB>$5$l$?$^$^$N>l9g$O!"(B 1.666 +$B;~4V@Z$l$H$_$J$5$l$^$9!#(B 1.667 +$B$=$N$?$a!"(B 1.668 +$BNc$($P?MCN$l$:%7%9%F%`$,Dd;_$7$?$H$7$F$b!"(B 1.669 +$B<+F02=$5$l$?F|<!=hM}$,Dd;_$7$?$^$^$K$J$C$?$j!"(B 1.670 +$BDd;_$7$J$$=hM}$,<!!9$H@Q$_>e$,$C$?$j$9$k$3$H$O$"$j$^$;$s!#(B 1.671 + 1.672 +\subsubsection{Safe dirstate access} 1.673 + 1.674 +dirstate $B7A<0%U%!%$%k$+$i$N%j%S%8%g%s>pJs$NFI$_=P$7$K:]$7$F!"(B 1.675 +Mercurial $B$O%U%!%$%k$KBP$9$kGSB>$r9T$C$?$j$O$;$:!"(B 1.676 +$B=q$-9~$_$N:]$K$N$_GSB>$r9T$$$^$9!#(B 1.677 +$BIT40A4$J=q$-9~$_$r(B 1.678 +dirstate $B7A<0%U%!%$%k$+$iFI$_=P$7$F$7$^$&$3$H$r2sHr$9$k$?$a!"(B 1.679 +Mercurial $B$O(B 1.680 +$BBP>](B dirstate $B7A<0%U%!%$%k$HF1$8%G%#%l%/%H%j$KFCM-$NL>A0$G%U%!%$%k$r=q$-=P$7!"(B 1.681 +$B$3$N0l;~%U%!%$%k$r(B \filename{dirstate} 1.682 +$B%U%!%$%k$X$HIT2DJ,$JA`:n$G2~L>$7$^$9!#(B 1.683 +$B$=$N$?$a!"(B 1.684 +\filename{dirstate} $B$H$$$&!VL>A0$N!W%U%!%$%k$O!"(B 1.685 +$BIT40A4$J=q$-9~$_$r;}$?$J$$40A4$JFbMF$G$"$k$3$H$,J]>Z$5$l$^$9!#(B 1.686 + 1.687 +\subsection{Avoiding seeks} 1.688 + 1.689 +$BHf3SE*BgNL$N%G!<%?FI$_9~$_=hM}$KBP$7$F$9$i!"(B 1.690 +$B%G%#%9%/%X%C%I$N%7!<%/$OHs>o$K%3%9%H$,9b$/$D$/$?$a!"(B 1.691 +Mercurial $B$N@-G=3NJ]$N=EMW$JE@$O!"(B 1.692 +$B%G%#%9%/%X%C%I$N%7!<%/$r6KNO2sHr$9$k$3$H$K$"$j$^$9!#(B 1.693 + 1.694 +$BNc$($P(B dirstate $B7A<0$N$h$&$J%G!<%?$,!"(B 1.695 +$BC10l$N%U%!%$%k$KJ]B8$5$l$kM}M3$,$3$3$K$"$j$^$9!#(B 1.696 +Mercurial $B$K$h$j9=@.4IM}$5$l$k%G%#%l%/%H%j$4$H$K(B 1.697 +\filename{dirstate} $B%U%!%$%k$,B8:_$9$k>l9g$O!"(B 1.698 +$B%G%#%l%/%H%j$4$H$K%G%#%9%/%X%C%I$N%7!<%/$,H/@8$7F@$^$9!#(B 1.699 +$B$=$N$h$&$J%G%#%9%/%X%C%I$N%7!<%/$r2sHr$9$k$?$a$K!"(B 1.700 +Mercurial $B$O0lEY$KC10l$N(B 1.701 +\filename{dirstate} $B%U%!%$%kA4BN$rFI$_9~$_$^$9(B\footnote{$BLuCm(B: 1.702 +$B%G%#%9%/$NMxMQ$,?J$s$G6u$-%V%m%C%/$,CGJR2=$5$l$?>l9g!"(B 1.703 +$BITO"B3$J%V%m%C%/$,3d$jEv$F$i$l$^$9$+$i!"(B 1.704 +$BI,$:$7$b!VC10l%U%!%$%k!W!a!V%X%C%I$N%7!<%/$,2sHr2DG=!W$G$O$"$j$^$;$s$,!"(B 1.705 +$B>/$J$/$H$b!V%X%C%I$N%7!<%/$rDc8:!W$9$k$3$H$O2DG=$G$9!#(B}$B!#(B 1.706 + 1.707 +$B%m!<%+%k%9%H%l!<%8$K$*$1$k%j%]%8%H%j$NJ#@=$N:]$K$O!"(B 1.708 +Mercurial $B$O(B``$B=q$-=P$7;~J#@=(B''$B$N;EAH$_$b;HMQ$7$^$9!#(B 1.709 +$BJ#@=85%j%]%8%H%j$+$iJ#@=@h$K8D!9$N(B revlog $B%U%!%$%k$rJ#@=$9$kBe$o$j$K!"(B 1.710 +``$B%O!<%I%j%s%/(B''$B$r;HMQ$9$k$3$H$G!"(B 1.711 +``$B#2$D$N%U%!%$%kL>$,F10lFbMF$N%U%!%$%k$r;2>H(B'' 1.712 +$B$9$k$3$H$r<jAa$/I=L@$7$^$9!#(B 1.713 +$B0lJ}$N(B revlog $B%U%!%$%k$K=q$-9~$_$r9T$&:]$K$O!"(B 1.714 +Mercurial $B$OEv3:%U%!%$%k$N%O!<%I%j%s%/$r3NG'$7$^$9!#(B 1.715 +$BEv3:%U%!%$%k$,J#?t$N%j%]%8%H%j$+$i;2>H$5$l$$$F$$$k>l9g!"(B 1.716 +Mercurial $B$OEv3:%j%]%8%H%jMQ$K(B revlog $B$N?7$?$JJ#@=$r:n@.$7$^$9!#(B 1.717 + 1.718 +$B2??M$+$N9=@.4IM}%D!<%k$N3+H/<T$K$h$j!"(B 1.719 +$B$3$NJ}K!(B--- 1.720 +$B40A4$K%j%]%8%H%j8GM-$N$b$N$H$7$F%U%!%$%k$rJ#@=$9$k(B--- 1.721 +$B$,%G%#%9%/;HMQNL:o8:$K$=$l$[$I8z2LE*$G$J$$$H$N;XE&$r<u$1$F$$$^$9!#(B 1.722 +$B$=$l$O;v<B$G$O$"$j$^$9$,!"(B 1.723 +$B%G%#%9%/MFNL$N3NJ]$O0B2A$G$"$j!"(B 1.724 +OS $B$X$NJ#@=MW5a$rCY1d$9$k$3$H$K$h$j9b$$@-G=$rF@$k$3$H$,$G$-$^$9!#(B 1.725 +$BJL$J;EAH$_$rMQ$$$k>l9g!"(B 1.726 +$B@-G=$,Dc2<$7%=%U%H%&%'%"$NJ#;($5$,A}$7$^$9$N$G!"(B 1.727 +$BF|!9$NMxMQ$K$*$1$k(B``$BBN46(B''$B$KHs>o$K1F6A$r5Z$\$7$^$9(B\footnote{$BLuCm(B: 1.728 +$B$D$^$j!"(B 1.729 +Mercurial $B$G$N%O!<%I%j%s%/$N;HMQ$O!"(B 1.730 +$BJ#@=$r9T$&$3$H$K$h$k%G%#%9%/%X%C%I$N%7!<%/$rDc8:$9$k$N$,<g4c$G!"(B 1.731 +$B%G%#%9%/;HMQNL$NDc8:$,<g4c$G$O$J$$!"(B 1.732 +$B$H$$$&$3$H$G$9!#(B}$B!#(B 1.733 + 1.734 +\subsection{Other contents of the dirstate} 1.735 +\label{sec:concepts:dirstate} 1.736 + 1.737 +$B%U%!%$%k$NJQ99$N:]$N(B Mercurial $B$X$NDLCN$,I,MW$J$$$3$H$+$i!"(B 1.738 +$B%U%!%$%kJQ99$NM-L5$r8zN(E*$KH=Dj$9$k$?$a$K!"(B 1.739 +$BFCJL$J>pJs$r3JG<$7$?(B dirstate $B7A<0%U%!%$%k$r;HMQ$7$^$9!#(B 1.740 +$B:n6HNN0h%G%#%l%/%H%jCf$NA4$F$N%U%!%$%k$KBP$7$F!"(B 1.741 +Mercurial $B$O%U%!%$%k$N:G=*JQ99F|;~$H$=$N;~E@$G$N%5%$%:$r(B 1.742 +dirstate $B7A<0%U%!%$%k$K3JG<$7$F$$$^$9!#(B 1.743 + 1.744 +\hgcmd{add}$B!"(B\hgcmd{remove}$B!"(B\hgcmd{rename} $B$J$$$7(B 1.745 +\hgcmd{copy} $B$rL@<(E*$K;HMQ$7$?>l9g!"(B 1.746 +Mercurial $B$O$3$N>pJs$r99?7$7$^$9$N$G!"(B 1.747 +$B%3%_%C%H;~$N?6$kIq$$$rFCDj$G$-$^$9!#(B 1.748 + 1.749 +Mercurial $B$,:n6HNN0h%G%#%l%/%H%jCf$N%U%!%$%k$r3NG'$9$k>l9g!"(B 1.750 +$B:G=i$K%U%!%$%k$NJQ99F|;~$r3NG'$7$^$9!#(B 1.751 +$BJQ99F|;~$,F10l$J$i$P!"%U%!%$%k$OJQ99$5$l$F$$$J$$H&$G$9!#(B 1.752 +$B%U%!%$%k%5%$%:$,0[$J$C$F$$$k$J$i$P!"%U%!%$%k$OJQ99$5$l$F$$$kH&$G$9!#(B 1.753 +$BJQ99F|;~$,0[$J$C$F$$$k$N$K%U%!%$%k%5%$%:$,F10l$N>l9g$K$N$_!"(B 1.754 +$B%U%!%$%k$NFbMF$,0[$J$C$F$$$k$+H]$+$rH=Dj$9$k$?$a$K(B 1.755 +Mercurial $B$O<B:]$K%U%!%$%k$NFbMF$rFI$_9~$_$^$9(B\footnote{$BLuCm(B: 1.756 +Windows $B4D6-$G$N2~9TJQ49$r9T$C$F$$$k$h$&$J>l9g!"(B 1.757 +$B%P%$%J%jHG$H%=!<%9HG$G%U%!%$%k%5%$%:$N;;=P<j=g$K0c$$$,$"$k$i$7$/!"(B 1.758 +\hgcmd{diff} $B$,2?$b=PNO$7$J$$$N$K!"(B 1.759 +\hgcmd{state} $B$G$O!VJQ99!W07$$$5$l$k$3$H$,5)$K$"$j$^$9!#(B}$B!#(B 1.760 +$B$3$N$h$&$K6O$+$JDI2C>pJs$r3JG<$9$k$3$H$G!"(B 1.761 +Mercurial $B$,I,MW$H$9$kFI$_9~$_%G!<%?NL$r7`E*$K8:$i$9$3$H$,$G$-!"(B 1.762 +$BB>$N9=@.4IM}%7%9%F%`$HHf3S$7$FBgI}$K@-G=$,2~A1$5$l$F$$$^$9!#(B 1.763 + 1.764 +%%% Local Variables: 1.765 +%%% mode: latex 1.766 +%%% TeX-master: "00book" 1.767 +%%% End: