1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/daily.tex	Mon Oct 26 16:12:39 2009 +0100
     1.3 @@ -0,0 +1,533 @@
     1.4 +\chapter{Mercurial in daily use}
     1.5 +\label{chap:daily}
     1.6 +
     1.7 +\section{Telling Mercurial which files to track}
     1.8 +
     1.9 +$B%U%!%$%k$N4IM}$r;X<($7$J$$8B$j!"(B
    1.10 +$B%j%]%8%H%jCf$N%U%!%$%k$KBP$7$F(B Mercurial $B$O2?$b9T$$$^$;$s!#(B
    1.11 +\hgcmd{status} $B%3%^%s%I$O!"(B
    1.12 +Mercurial $B$N4IM}2<$KL5$$%U%!%$%k$r(B
    1.13 +``\texttt{?}'' $B$rI=<($9$k$3$H$GCN$i$;$F$/$l$^$9(B
    1.14 +
    1.15 +Mercurial $B$K$h$k9=@.4IM}$r;X<($9$k$K$O!"(B
    1.16 +\hgcmd{add} $B%3%^%s%I$r;HMQ$7$^$9!#(B
    1.17 +$B%U%!%$%k$N9=@.4IM}$r;X<($7$?%U%!%$%k$N(B
    1.18 +\hgcmd{status} $B$K$h$kI=<($O!"(B
    1.19 +``\texttt{?}'' $B$+$i(B ``\texttt{A}'' $B$X$HJQ2=$7$^$9!#(B
    1.20 +
    1.21 +\interaction{daily.files.add}
    1.22 +
    1.23 +\hgcmd{commit} $B$r<B9T$7$?D>8e$O!"(B
    1.24 +$B%3%_%C%HA0$KDI2C$7$?%U%!%$%k$,(B
    1.25 +\hgcmd{status} $B$K$h$jI=<($5$l$k$3$H$O$"$j$^$;$s!#(B
    1.26 +$B$3$l$O!"(B
    1.27 +``$B6=L#?<$$(B''$B%U%!%$%k(B---
    1.28 +$BJQ99$7$?$j!"(BMercurial $B$K2?$i$+$NA`:n$rMW5a$7$?%U%!%$%k(B
    1.29 +---$B$K$D$$$FI=<($9$k$N$,(B
    1.30 +\hgcmd{status} $B$NLr3d$@$+$i$G$9!#(B
    1.31 +$B?t@i$N%U%!%$%k$+$i@.$k%j%]%8%H%j$,$"$k>l9g!"(B
    1.32 +$B9=@.4IM}$5$l$F$O$$$F$bFC$KJQ99$5$l$F$$$J$$%U%!%$%k$N0lMw(B
    1.33 +$B!J8e=R$9$k$h$&$K!"$=$N$h$&$J%U%!%$%k0lMw$N>pJs$rF@$k$3$H$b$G$-$^$9!K(B
    1.34 +$B$rM_$7$$$H;W$&$3$H$O5)$G$9!#(B
    1.35 +
    1.36 +$B0lC6%U%!%$%k$rDI2C$7$?$H$7$F$b!"(B
    1.37 +$B$=$N%U%!%$%k$KBP$7$F(B Mercurial $B$O$9$0$K$O2?$b9T$$$^$;$s!#(B
    1.38 +$B$=$NBe$o$j!"(B
    1.39 +$B<!$K%3%_%C%H$r9T$C$?:]$K%U%!%$%k>uBV$N%9%J%C%W%7%g%C%H$r:n@.$7$^$9!#(B
    1.40 +Mercurial $B$O$=$l0J9_!"(B
    1.41 +$B9=@.4IM}2<$+$i=|30$9$k$^$G!"(B
    1.42 +$B%3%_%C%H$N:]$K$O>o$KEv3:%U%!%$%k$NJQ99>u67$r3NG'$7$^$9!#(B
    1.43 +
    1.44 +\subsection{Explicit versus implicit file naming}
    1.45 +
    1.46 +Mercurial $B$NM-MQ$J?6$kIq$$$H$7$F!"(B
    1.47 +Mercurial $B$N%3%^%s%I$K%G%#%l%/%H%jL>$r;XDj$7$?>l9g!"(B
    1.48 +$B$=$N;XDj$r(B
    1.49 +``$BEv3:%G%#%l%/%H%jG[2<$NA4$F$N%U%!%$%k(B\footnote{$BLuCm(B:
    1.50 +$BEv3:%G%#%l%/%H%jD>2<$N%U%!%$%k$J$i$S$K!"(B
    1.51 +$B%5%V%G%#%l%/%H%j0J2<$N%U%!%$%kA4$F(B}$B$KBP$9$kA`:n$N<B;\(B''
    1.52 +$B$,MW5a$5$l$?$b$N$H$_$J$7$^$9!#(B
    1.53 +
    1.54 +\interaction{daily.files.add-dir}
    1.55 +
    1.56 +$B@h$NNc$G(B \filename{a} 
    1.57 +$B%U%!%$%k$r9=@.4IM}BP>]$KDI2C$7$?:]$K$O!"(B
    1.58 +Mercurial $B$ODI2C$5$l$?%U%!%$%k$N%U%!%$%kL>$rI=<($7$F$$$^$;$s$,!"(B
    1.59 +$B$3$NNc$G$O(B
    1.60 +$B9=@.4IM}BP>]$KDI2C$5$l$?%U%!%$%k$rI=<($7$F$$$kE@$KCm0U$7$F$/$@$5$$!#(B
    1.61 +
    1.62 +$B@h$NNc$G$O!"(B
    1.63 +$BDI2C$9$k%U%!%$%kL>$r%3%^%s%I%i%$%s$GL@<(E*$K;XDj$7$^$7$?$N$G!"(B
    1.64 +$B$=$N$h$&$J>l9g$OMxMQ<T<+?H$,<+J,$N?6$kIq$$$rM}2r$7$F$$$k$b$N$H$_$J$7!"(B
    1.65 +Mercurial $B$O2?$bI=<($7$^$;$s!#(B
    1.66 +
    1.67 +$B$7$+$7!"(B
    1.68 +$B%G%#%l%/%H%jL>$r;XDj$9$k$3$H$G%U%!%$%kL>$r(B\emph{$B0E<((B}$B$7$?>l9g!"(B
    1.69 +Mercurial $B$OFCJL$KA`:nBP>]$H$J$C$?8D!9$N%U%!%$%kL>$rI=<($7$^$9!#(B
    1.70 +$B$3$&$9$k$3$H$G2?$,<B;\$5$l$?$N$+$,L@3N$K$J$k$?$a!"(B
    1.71 +$B$R$C$=$j$H$d$C$+$$$JLdBj$,H/@8$9$k2DG=@-$rDc8:$7$^$9!#(B
    1.72 +$B$3$N?6$kIq$$$OKX$I$N(B
    1.73 +Mercurial $B%3%^%s%I$K6&DL$7$F$$$^$9!#(B
    1.74 +
    1.75 +\subsection{Aside: Mercurial tracks files, not directories}
    1.76 +
    1.77 +$B%G%#%l%/%H%j$O(B Mercurial $B$K$h$k9=@.4IM}$NBP>]$K$O$J$j$^$;$s!#(B
    1.78 +$B$=$NBe$o$j!"(B
    1.79 +Mercurial $B$O%U%!%$%k$N%Q%9$r9=@.4IM}$7$^$9!#(B
    1.80 +$B%U%!%$%k$N@8@.$N:]$K$O!"(B
    1.81 +$B$=$l$K@hN)$C$F%Q%9$K4^$^$l$kB8:_$7$J$$%G%#%l%/%H%j$rA4$F:n@.$7$^$9!#(B
    1.82 +$B%U%!%$%k$N:o=|$N:]$K$O!"(B
    1.83 +$B:o=|$5$l$?%U%!%$%k$X$N%Q%9$K4^$^$l$k6u%G%#%l%/%H%j$rA4$F:o=|$7$^$9!#(B
    1.84 +$B$?$o$$$bL5$$$3$H$KJ9$3$($k$+$b$7$l$^$;$s$,!"(B
    1.85 +Mercurial $B$,40A4$K6u$C$]$N%G%#%l%/%H%j$r<h$j07$($J$$!"(B
    1.86 +$B$H$$$&>.$5$$$J$,$i$b<BMQ>e=EBg$J@-<A$r<($7$F$$$^$9!#(B
    1.87 +
    1.88 +$B6u$N%G%#%l%/%H%j$,M-MQ$J$3$H$OLGB?$KL5$$$G$9$7!"(B
    1.89 +$BBEEv$J8z2L$rF@$k$?$a$N95$($a$J2sHrJ}K!$,$"$j$^$9!#(B
    1.90 +Empty directories are rarely useful, and there are unintrusive
    1.91 +workarounds that you can use to achieve an appropriate effect.  
    1.92 +$B$=$l8N$K!"(B
    1.93 +$B6u$N%G%#%l%/%H%j$r07$&$3$H$K$h$k8BDjE*$JM-1W@-$,!"(B
    1.94 +$B$=$l$KI,MW$H$5$l$kJ#;($5$K8+9g$&$b$N$G$O$J$$!"(B
    1.95 +$B$H(B Mercurial $B$N3+H/?X$OH=CG$7$^$7$?!#(B
    1.96 +
    1.97 +$B6u$N%G%#%l%/%H%j$r%j%]%8%H%j$G4IM}$7$?$$>l9g!"(B
    1.98 +$BJ#?t$N<B8=J}K!$,$"$j$^$9!#(B
    1.99 +$B#1$D$OEv3:%G%#%l%/%H%jD>2<$N(B``$B1#$7(B''$B%U%!%$%k$r(B 
   1.100 +\hgcmd{add} $B$9$k$3$H$G$9!#(B
   1.101 +UNIX $B%i%$%/$J%7%9%F%`$G$O!"(B
   1.102 +$B%T%j%*%I!J(B``\texttt{.}''$B!K$G;O$^$kL>A0$N%U%!%$%k$O!"(B
   1.103 +$BKX$I$N%3%^%s%I$d(B GUI $B%D!<%k$+$i1#$7%U%!%$%k$H$7$F07$o$l$^$9!#(B
   1.104 +$B$3$N<jK!$r?^(B~\ref{ex:daily:hidden}$B$K<($7$^$9!#(B
   1.105 +
   1.106 +\begin{figure}[ht]
   1.107 +  \interaction{daily.files.hidden}
   1.108 +  \caption{Simulating an empty directory using a hidden file}
   1.109 +  \label{ex:daily:hidden}
   1.110 +\end{figure}
   1.111 +
   1.112 +$B6u%G%#%l%/%H%j$rI,MW$H$9$k>l9g$N$b$&0l$D$N2r7hJ}K!$O!"(B
   1.113 +$B<+F02=$5$l$?%S%k%I%9%/%j%W%H$GI,MW$K$J$kETEY:n@.$9$k!"(B
   1.114 +$B$H$$$&$b$N$G$9!#(B
   1.115 +
   1.116 +\section{How to stop tracking a file}
   1.117 +
   1.118 +$B%j%]%8%H%j$K$H$C$FITMW$K$J$C$?(B\footnote{$BLuCm(B:
   1.119 +$B9=@.4IM}$NI,MW@-$,$J$/$J$C$?(B}$B%U%!%$%k$,$"$k>l9g$O!"(B
   1.120 +\hgcmd{remove} $B%3%^%s%I$r;HMQ$^$9!#(B
   1.121 +$B$3$N%3%^%s%I$O%U%!%$%k$r:o=|$7$D$D!"(B
   1.122 +Mercurial $B$K9=@.4IM}BP>]$+$i%U%!%$%k$r=|30$9$k;]$rDLCN$7$^$9!#(B
   1.123 +$B:o=|$5$l$?%U%!%$%k$O!"(B
   1.124 +\hgcmd{status} $B$N=PNO$G$O(B
   1.125 +``\texttt{R}'' $BIU$-$GI=<($5$l$^$9!#(B
   1.126 +
   1.127 +\interaction{daily.files.remove}
   1.128 +
   1.129 +\hgcmd{remove} $B$K$h$k%U%!%$%k$N:o=|$r9T$&$H!"(B
   1.130 +$B:n6HNN0h%G%#%l%/%H%j$KF1L>$N%U%!%$%k$r:FEY:n@.$7$?$H$7$F$b!"(B
   1.131 +Mercurial $B$O$=$N%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$7$^$9!#(B
   1.132 +$BF1L>%U%!%$%k$r:F@8@.$7(B Mercurial $B$K$h$k9=@.4IM}$r9T$&>l9g$K$O!"(B
   1.133 +$BC1=c$K$=$N%U%!%$%k$r(B \hgcmd{add} $B$7$F$/$@$5$$!#(B
   1.134 +Mercurial $B$O?75,$K4IM}BP>]$K2C$($i$l$?%U%!%$%k$,!"(B
   1.135 +$B0JA04IM}$7$F$$$?F1L>$N%U%!%$%k$H$OL54X78$G$"$k$H$_$J$7$^$9!#(B
   1.136 +
   1.137 +\subsection{Removing a file does not affect its history}
   1.138 +
   1.139 +$B=EMW$J;v$G$9$N$G!"(B
   1.140 +\hgcmd{remove} $B%3%^%s%I$K$h$kA`:n$,;}$D1F6A$O#2$D$@$1$G$"$k!"(B
   1.141 +$B$HM}2r$7$F$/$@$5$$!#(B
   1.142 +
   1.143 +\begin{itemize}
   1.144 +\item $B:n6HNN0h%G%#%l%/%H%j$+$i!"8=;~E@$N%U%!%$%k$r:o=|$7$^$9(B
   1.145 +
   1.146 +\item Mercurial $B$KBP$7$F!"<!2s$N%3%_%C%H0J9_!"(B
   1.147 +  $BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$9$k$h$&$KDLCN$7$^$9(B
   1.148 +
   1.149 +\end{itemize}
   1.150 +
   1.151 +\hgcmd{remove} $B%3%^%s%I$K$h$kA`:n$O!"(B
   1.152 +$B%U%!%$%k$N(B\emph{$BJQ99MzNr(B}$B$K$O0l@ZJQ99$r2C$((B\emph{$B$^$;$s(B}$B!#(B
   1.153 +
   1.154 +$B:n6HNN0h%G%#%l%/%H%j$r(B
   1.155 +\hgcmd{remove} 
   1.156 +$B$G:o=|$7$?%U%!%$%k$,$^$@9=@.4IM}$5$l$F$$$?;~E@$N%A%'%s%8%;%C%H$G99?7$7$?>l9g!"(B
   1.157 +$B$=$N%A%'%s%8%;%C%H$,%3%_%C%H$5$l$?;~E@$NFbMF$G!"(B
   1.158 +$B:n6HNN0h%G%#%l%/%H%j$KEv3:%U%!%$%k$,:F@8@.$5$l$^$9!#(B
   1.159 +$B$=$N8e$G!"(B
   1.160 +$BEv3:%U%!%$%k$,(B \hgcmd{remove} 
   1.161 +$B$G:o=|$5$l$?;~E@$N%A%'%s%8%;%C%H$G99?7$9$k$H!"(B
   1.162 +Mercurial $B$O:F$SEv3:%U%!%$%k$r:n6HNN0h$+$i:o=|$7$^$9!#(B
   1.163 +
   1.164 +\subsection{Missing files}
   1.165 +
   1.166 +\hgcmd{remove} 
   1.167 +$B%3%^%s%I$r;HMQ$;$:$K:n6HNN0h%G%#%l%/%H%j$+$i:o=|$7$?%U%!%$%k$r!"(B
   1.168 +Mercurial $B$O(B\emph{$B9TJ}ITL@(B}$B$H$_$J$7$^$9!#(B
   1.169 +$B9TJ}ITL@$N%U%!%$%k$O!"(B
   1.170 +\hgcmd{status} $B$N=PNO$G$O(B
   1.171 +``\texttt{!}'' $BIU$-$GI=<($5$l$^$9!#(B
   1.172 +Mercurial $B$N%3%^%s%I72A4HL$O!"(B
   1.173 +$B9TJ}ITL@$N%U%!%$%k$K4X$7$F$O2?$b9T$$$^$;$s!#(B
   1.174 +
   1.175 +\interaction{daily.files.missing}
   1.176 +
   1.177 +\hgcmd{status} 
   1.178 +$B$,9TJ}ITL@$H$7$FI=<($9$k%U%!%$%k$,%j%]%8%H%jCf$K$"$k>l9g(B\footnote{$BLuCm(B:
   1.179 +$B$D$^$j<jF0$G%U%!%$%k$r:o=|$7$?>l9g(B}$B!"(B
   1.180 +$B%U%!%$%k:o=|8e$NG$0U$N;~E@$G(B
   1.181 +\hgcmdargs{remove}{\hgopt{remove}{--after}} $B$r<B9T$9$k$3$H$G(B
   1.182 +$BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$9$k0U;W$,$"$k$3$H$r(B
   1.183 +Mercurial $B$KDLCN$9$k$3$H$,$G$-$^$9!#(B
   1.184 +
   1.185 +\interaction{daily.files.remove-after}
   1.186 +
   1.187 +$B$=$N0lJ}$G!"(B
   1.188 +$B9TJ}ITL@$H$5$l$F$$$k%U%!%$%k$,0U?^$;$:$K:o=|$7$F$7$^$C$?$b$N$J$i!"(B
   1.189 +\hgcmd{revert} $B$KEv3:%U%!%$%kL>$r;XDj$9$k$3$H$G!"(B
   1.190 +$BJQ99$5$l$F$$$J$$>uBV$K%U%!%$%k$rI|5l$9$k$3$H$,$G$-$^$9!#(B
   1.191 +
   1.192 +\interaction{daily.files.recover-missing}
   1.193 +
   1.194 +\subsection{Aside: why tell Mercurial explicitly to remove a file?}
   1.195 +
   1.196 +$B%U%!%$%k:o=|$N0U;WI=<($r0l!9(B Mercurial $B$K<($9I,MW@-$K$D$$$F!"(B
   1.197 +$B5?Ld$K;W$o$l$k$+$b$7$l$^$;$s!#(B
   1.198 +Mercurial $B$N3+H/=i4|$K$*$1$k:o=|J}K!$O!"(B
   1.199 +$B$=$N$h$&$K;W$&?M$K$H$C$F$OK>$^$7$$$b$N$+$b$7$l$^$;$s!#(B
   1.200 +Mercurial $B$O(B \hgcmd{commit} $B%3%^%s%I<B9T;~$K%U%!%$%k$NIT:_$r<+F0E*$K8!CN$7!"(B
   1.201 +$BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$7$F$$$?$N$G$9!#(B
   1.202 +$B<B:]LdBj!"$3$N:o=|J}K!$G$O!"(B
   1.203 +$BITN8$N;vBV$GDLCN$bL5$/%U%!%$%k$,:o=|$5$l$k;vBV$,MF0W$K5/$3$jF@$^$9!#(B
   1.204 +
   1.205 +\subsection{Useful shorthand---adding and removing files in one step}
   1.206 +
   1.207 +Mercurial $B$O!"(B
   1.208 +$B9=@.4IM}BP>]$X$N%U%!%$%k$NDI2C$H=|30$r9T$&!"(B
   1.209 +$BAH$_9g$o$;%3%^%s%I$G$"$k(B \hgcmd{addremove} $B$rDs6!$7$F$$$^$9!#(B
   1.210 +
   1.211 +\interaction{daily.files.addremove}
   1.212 +
   1.213 +\hgcmd{commit} $B%3%^%s%I$b!"(B
   1.214 +$B%3%_%C%H<B;\$ND>A0$K(B
   1.215 +\hgcmd{addremove} $B$HF1$8J}?K$G9=@.4IM}BP>]$X$NDI2C!?=|30$r9T$&(B
   1.216 +\hgopt{commit}{-A} $B%*%W%7%g%s$rDs6!$7$F$$$^$9!#(B
   1.217 +
   1.218 +\interaction{daily.files.commit-addremove}
   1.219 +
   1.220 +\section{Copying files}
   1.221 +
   1.222 +Mercurial $B$O%U%!%$%k$NJ#@=$r9T$&(B
   1.223 +\hgcmd{copy} $B%3%^%s%I$rDs6!$7$F$$$^$9!#(B
   1.224 +$B$3$N%3%^%s%I$G%U%!%$%k$rJ#@=$7$?>l9g!"(B
   1.225 +Mercurial $B$O$=$N%U%!%$%k$,85%U%!%$%k$NJ#@=$G$"$k$3$H$r5-O?$7$^$9!#(B
   1.226 +$B%A%'%s%8%;%C%H$N%^!<%8$N:]$K$O!"(B
   1.227 +Mercurial $B$O$3$NJ#@=%U%!%$%k$rFCJL07$$$7$^$9!#(B
   1.228 +
   1.229 +\subsection{The results of copying during a merge}
   1.230 +
   1.231 +$BJ#@=%U%!%$%k$N%^!<%8$N:]$K$O!"(B
   1.232 +$BJQ99FbMF$,J#@=%U%!%$%k$^$G(B``$BDI=>(B''$B$7$F$-$^$9!#(B
   1.233 +$B$3$N$3$H$,;}$D0UL#$r>e<j$/@bL@$9$k$?$a$K!"(B
   1.234 +$B4JC1$JNc$r:n@.$7$^$7$g$&!#(B
   1.235 +$B$3$l$^$G$NNc$HF1MM$K!"(B
   1.236 +$B#1$D$@$1%U%!%$%k$r;}$D4J0WE*$J%j%]%8%H%j$r:n@.$7$^$9!#(B
   1.237 +
   1.238 +\interaction{daily.copy.init}
   1.239 +
   1.240 +$B%^!<%8$r9T$&$?$a$K$O!"(B
   1.241 +$BJL!9$N:n6H$rJ?9T$7$F9T$&I,MW$,$"$j$^$9$N$G!"(B
   1.242 +$B%j%]%8%H%j$rJ#@=$7$^$7$g$&!#(B
   1.243 +
   1.244 +\interaction{daily.copy.clone}
   1.245 +
   1.246 +$B:G=i$N%j%]%8%H%j$KLa$j!"(B
   1.247 +\hgcmd{copy} $B%3%^%s%I$G:G=i$K:n@.$7$?%U%!%$%k$rJ#@=$7$^$9!#(B
   1.248 +
   1.249 +\interaction{daily.copy.copy}
   1.250 +
   1.251 +$BJ#@=8e$N(B \hgcmd{status} $B%3%^%s%I$N=PNO$G$O!"(B
   1.252 +$BJ#@=$5$l$?%U%!%$%k$OC1$KDI2C$5$l$?IaDL$N%U%!%$%k$HF1$8$h$&$K8+$($^$9!#(B
   1.253 +
   1.254 +\interaction{daily.copy.status}
   1.255 +
   1.256 +$B$7$+$7(B
   1.257 +\hgopt{status}{-C} $B%*%W%7%g%sIU$-$G(B
   1.258 +\hgcmd{status} $B$r<B9T$9$k$3$H$G!"(B
   1.259 +$BJL$J9T$,I=<($5$l$^$9!#(B
   1.260 +$B$3$N9T$O!"?7$?$KDI2C$5$l$?%U%!%$%k$NJ#@=(B\emph{$B85(B}$B$G$"$k$3$H$r0UL#$7$^$9!#(B
   1.261 +
   1.262 +\interaction{daily.copy.status-copy}
   1.263 +
   1.264 +$BJ#@=$7$?%j%]%8%H%j$KLa$j!"(B
   1.265 +$BJ?9T$7$FJQ99:n6H$r9T$$$^$9!#(B
   1.266 +$BJ#@=85$K$J$C$?%U%!%$%k$KBP$7$F9T$rDI2C$7$^$9!#(B
   1.267 +
   1.268 +\interaction{daily.copy.other}
   1.269 +
   1.270 +$B$3$N%j%]%8%H%j$G$OJ#@=85$N(B \filename{file} $B$,JQ99$5$l$^$7$?!#(B
   1.271 +$B:G=i$N%j%]%8%H%j$+$iJQ99FbMF$r(B 
   1.272 +\hgcmd{pull} $B$7$F#2$D$N(B head $B$r%^!<%8$9$k:]$K(B Mercurial $B$O!"(B
   1.273 +\filename{file} $B$KBP$7$F$@$19T$C$?JQ99FbMF$r!"(B
   1.274 +$B$=$NJ#@=$G$"$k(B \filename{new-file} $B$K$^$GEAGE$5$;$^$9!#(B
   1.275 +
   1.276 +\interaction{daily.copy.merge}
   1.277 +
   1.278 +\subsection{Why should changes follow copies?}
   1.279 +\label{sec:daily:why-copy}
   1.280 +
   1.281 +$B%U%!%$%k$NJ#@=$KBP$7$F$kJQ99$,EAGE$5$l$k5sF0$O!"(B
   1.282 +$BFq2r$K;W$($k$+$b$7$l$^$;$s$,!"(B
   1.283 +$BB?$/$N>l9g$OHs>o$K9%$^$7$$?6$kIq$$$H$J$j$^$9!#(B
   1.284 +
   1.285 +$B$^$:$O!"(B
   1.286 +$B$3$NEAGE$,%^!<%8$N;~(B\emph{$B$@$1(B}$B$K9T$o$l$k!"(B
   1.287 +$B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
   1.288 +$B%U%!%$%k$r(B \hgcmd{copy} $B$GJ#@=$7!"(B
   1.289 +$B$=$l$K0z$-B3$-J#@=85%U%!%$%k$rJQ99$9$k!"(B
   1.290 +$B$H$$$&DL=j$N:n6H$K$*$$$F$O2?$bFCJL$J$3$H$O9T$o$l$^$;$s!#(B
   1.291 +
   1.292 +$B$b$&0lE@!"(B
   1.293 +$BJQ99$r<h$j9~$s$@%j%]%8%H%j$,!"(B
   1.294 +$B%U%!%$%k$rJ#@=$7$?$3$H$r(B\emph{$BCN$i$J$+$C$?(B}$B>l9g$K8B$j!"(B
   1.295 +$BJQ99FbMF$,J#@=@h%U%!%$%k$KEAGE$9$k!"(B
   1.296 +$B$H$$$&$3$H$K$bCm0U$7$F$/$@$5$$!#(B
   1.297 +
   1.298 +Mercurial $B$,$3$N$h$&$K?6Iq$&$N$O0J2<$N$h$&$JM}M3$N$?$a$G$9!#(B
   1.299 +$BNc$($PI.<T$,!"(B
   1.300 +$B%=!<%9%U%!%$%k$KBP$7$F=EMW$J%P%0=$@5$r9T$$!"(B
   1.301 +$BJQ99FbMF$r%3%_%C%H$7$?$H$7$^$9!#(B
   1.302 +$B$=$NJQ99:n6H$,9T$o$l$F$$$k4V$K!"(B
   1.303 +$B%P%0$N82:_2=$d$=$N=$@5$rBT$D;vL5$/!"(B
   1.304 +$BEv3:%U%!%$%k$r(B \hgcmd{copy} $B$GJ#@=$7!"(B
   1.305 +$B$=$NJ#@=@h%U%!%$%k$NJQ99$rFI<T$,;O$a$F$7$^$&$+$b$7$l$^$;$s!#(B
   1.306 +
   1.307 +$BFI<T$,I.<T$NJQ99$r<h$j9~$s$G%^!<%8$7$?:]$K!"(B
   1.308 +Mercurial $B$,J#@=$X$NJQ99$NH?1G$r(B\emph{$B9T$o$J$$(B}$B>l9g!"(B
   1.309 +$BFI<T$NJ#@=@h%U%!%$%k$O%P%0$r4^$s$G$$$k$?$a!"(B
   1.310 +$B<jF0$G%P%0=$@5$rH?1G$5$;$kI,MW@-$r;W$$=P$5$J$$8B$j!"(B
   1.311 +$B%P%0$OJ#@=@h%U%!%$%k$K(B\emph{$B;D$jB3$1$k(B}$B$G$7$g$&!#(B
   1.312 +
   1.313 +$B%P%0=$@5$K4X$9$kJQ99FbMF$N!"(B
   1.314 +$BJ#@=85$+$iJ#@=@h$X$N<+F0H?1G$K$h$j!"(B
   1.315 +Mercurial $B$O$3$N<j$NLdBj$r2sHr$7$F$$$^$9!#(B
   1.316 +$BI.<T$NCN$k8B$j(B Mercurial $B$O!"(B
   1.317 +$BJ#@=%U%!%$%k$KBP$9$k$3$N$h$&$JJQ99EAGE$r9T$&(B\emph{$BM#0l$N(B}$B9=@.4IM}%7%9%F%`$G$9!#(B
   1.318 +
   1.319 +$B%U%!%$%k$NJ#@=$H$=$l$KB3$/%^!<%8$N<B;\$,0lC6JQ99MzNr$K5-O?$5$l$?$J$i!"(B
   1.320 +$BJ#@=85%U%!%$%k$+$iJ#@=@h%U%!%$%k$X$N$=$l0J>e$NJQ99H?1G$ODL>o$OITMW$J$N$G!"(B
   1.321 +Mercurial $B$O%^!<%8;~E@$^$G$OJ#@=$XJQ99$rEAGE$5$;$^$9$,!"(B
   1.322 +$B$=$l0J>e$O9T$$$^$;$s!#(B
   1.323 +
   1.324 +\subsection{How to make changes \emph{not} follow a copy}
   1.325 +
   1.326 +$B2>$K!"2?$i$+$NM}M3$K$h$j!"(B
   1.327 +$BJ#@=%U%!%$%k$X$N<+F0E*$JJQ99H?1G$,I,MW$J$$$HH=CG$7$?$J$i!"(B
   1.328 +$B%7%9%F%`$NDL>o$NJ}K!(B
   1.329 +$B!J(BUnix $BE*$J%7%9%F%`$N>l9g$J$i(B \command{cp}$B!K(B
   1.330 +$B$G%U%!%$%k$rJ#@=$7!"(B
   1.331 +\hgcmd{add} $B$K$h$j<jF0$GJ#@=%U%!%$%k$r9=@.4IM}BP>]$KDI2C$7$F$/$@$5$$!#(B
   1.332 +$B$G$9$,!"$=$NA0$K(B\ref{sec:daily:why-copy}$B@a$rFI$_D>$7$F!"(B
   1.333 +Mercurial $B$K$h$k<+F0JQ99H?1G$NE,@Z@-$r==J,$K8!F$$7$F$/$@$5$$!#(B
   1.334 +
   1.335 +\subsection{Behaviour of the \hgcmd{copy} command}
   1.336 +
   1.337 +\hgcmd{copy} $B%3%^%s%I$r;HMQ$7$?>l9g!"(B
   1.338 +Mercurial $B$OB(:B$K:n6HNN0h%G%#%l%/%H%j$K8D!9$N%U%!%$%k$NJ#@=$r:n@.$7$^$9!#(B
   1.339 +$B$=$N$?$a!"(B
   1.340 +$B%U%!%$%k$K=$@5$r2C$($?8e$G!"(B
   1.341 +$B$=$NJQ99$r%A%'%s%8%;%C%H$H$7$F%3%_%C%H$9$k$3$H$J$/(B
   1.342 +\hgcmd{copy} $B$r9T$C$?>l9g!"(B
   1.343 +$BJ#@=@h%U%!%$%k$O$=$N;~E@$^$G$NJQ99FbMF$b4^$s$G$$$k$3$H$K$J$j$^$9(B
   1.344 +$B!J$3$N?6$kIq$$$K$D$$$F$3$3$G=R$Y$?$N$O!"(B
   1.345 +$B>/!9D>46$KH?$9$k$h$&$K46$8$i$l$?$+$i$G$9!K!#(B
   1.346 +
   1.347 +\hgcmd{copy} $B$O(B
   1.348 +Unix $B$N(B \command{cp} $B%3%^%s%I$HF1MM$K?6Iq$$$^$9(B
   1.349 +$B!J(B\hgcmd{cp} $B$H$$$&JLL>J}$,9%$_$G$"$l$P!"$3$A$i$b;HMQ$G$-$^$9!K!#(B
   1.350 +$BKvHx$N0z?t$O(B\emph{$BJ#@=@h(B}$B$r!"(B
   1.351 +$B$=$l0J30$N@h9T$9$k0z?t$O(B\emph{$BJ#@=85(B}$B$r0UL#$7$^$9!#(B
   1.352 +$BJ#@=85$KC10l$N%U%!%$%k$r!"(B
   1.353 +$BJ#@=@h$KB8:_$7$J$$%Q%9$r;XDj$7$?>l9g!"(B
   1.354 +Mercurial $B$OJ#@=@h$K;XDj$7$?L>A0$G?7$?$J%U%!%$%k$r@8@.$7$^$9!#(B
   1.355 +
   1.356 +\interaction{daily.copy.simple}
   1.357 +
   1.358 +$BJ#@=@h$,%G%#%l%/%H%j$N>l9g!"(B
   1.359 +Mercurial $B$OJ#@=85%U%!%$%k$rEv3:%G%#%l%/%H%j$KJ#@=$7$^$9!#(B
   1.360 +
   1.361 +\interaction{daily.copy.dir-dest}
   1.362 +
   1.363 +$B%G%#%l%/%H%j$NJ#@=$N>l9g$O!"(B
   1.364 +$B:F5"E*3n$D%G%#%l%/%H%j9=@.$rJ];}$7$D$DJ#@=$5$l$^$9!#(B
   1.365 +
   1.366 +\interaction{daily.copy.dir-src}
   1.367 +
   1.368 +$BJ#@=85$HJ#@=@h$NN>J}$,%G%#%l%/%H%j$N>l9g(B\footnote{$BLuCm(B:
   1.369 +$B@h$N!V%G%#%l%/%H%j$NJ#@=$N>l9g!W$O!"(B
   1.370 +$B!VJ#@=@h%G%#%l%/%H%j$,B8:_$7$J$$>l9g!W$r;X$7$^$9!#(B}$B!"(B
   1.371 +$BJ#@=85$N%G%#%l%/%H%j9=B$$O!"(B
   1.372 +$BJ#@=@h%G%#%l%/%H%jG[2<$G:F9=C[$5$l$^$9!#(B
   1.373 +
   1.374 +\interaction{daily.copy.dir-src-dest}
   1.375 +
   1.376 +$B<jF0$G%U%!%$%k$rJ#@=$7$?8e$G!"(B
   1.377 +$BEv3:%U%!%$%k$,J#@=$G$"$k$3$H$r(B Mercurial $B$KDLCN$9$k$K$O!"(B
   1.378 +\hgcmd{remove} $B$N>l9g$HF1MM$K!"(B
   1.379 +\hgopt{copy}{--after} $BIU$-$G(B \hgcmd{copy} $B%3%^%s%I$r;HMQ$7$^$9!#(B
   1.380 +
   1.381 +\interaction{daily.copy.after}
   1.382 +
   1.383 +\section{Renaming files}
   1.384 +
   1.385 +$B%U%!%$%k$rJ#@=$9$k$h$j$b!"(B
   1.386 +$B$`$7$m2~L>$NJ}$,I,MW$H$5$l$k$N$G$O$J$$$G$7$g$&$+!#(B
   1.387 +$B%U%!%$%k$N2~L>$h$j$b(B
   1.388 +\hgcmd{copy} $B%3%^%s%I$NJ}$r@h$K@bL@$7$?$N$O!"(B
   1.389 +Mercurial $B$,J#@=$H2~L>$rK\<AE*$K$OF1Ey$K07$C$F$$$k$?$a$G$9!#(B
   1.390 +$B$=$N$?$a!"(B
   1.391 +$B%U%!%$%k$NJ#@=$K$*$1$k(B Mercurial $B$N5sF0$rCN$k$3$H$G!"(B
   1.392 +$B%U%!%$%k$N2~L>$G4|BT$5$l$k?6$kIq$$$rCN$k$3$H$,$G$-$^$9!#(B
   1.393 +
   1.394 +\hgcmd{rename} $B%3%^%s%I$r;HMQ$7$?>l9g!"(B
   1.395 +Mercurial $B$O8D!9$N2~L>85%U%!%$%k$NJ#@=$r:n@.$7!"(B
   1.396 +$B$=$N>e$G2~L>85%U%!%$%k$r:o=|$7!"(B
   1.397 +$B$=$l$i$r9=@.4IM}BP>]$+$i=|30$7$^$9!#(B
   1.398 +
   1.399 +\interaction{daily.rename.rename}
   1.400 +
   1.401 +\hgcmd{status} $B%3%^%s%I$N=PNO$+$i!"(B
   1.402 +$B?7$?$KJ#@=$5$l$?%U%!%$%k$,9=@.4IM}BP>]$KDI2C$5$l!"(B
   1.403 +$B2~L>85%U%!%$%k$,=|30$5$l$F$$$k$3$H$,FI$_<h$l$^$9!#(B
   1.404 +
   1.405 +\interaction{daily.rename.status}
   1.406 +
   1.407 +\hgcmd{copy} $B<B9T$N>l9g$HF1MM$K!"(B
   1.408 +\hgopt{status}{-C} $B%*%W%7%g%sIU$-$G(B \hgcmd{status} $B%3%^%s%I$r<B9T$9$k$3$H$G!"(B
   1.409 +$B9=@.4IM}BP>]$KDI2C$5$l$?%U%!%$%k$,<B:]$K$O!"(B
   1.410 +$B:#$O:o=|$5$l$F$7$^$C$?%U%!%$%k$NJ#@=%U%!%$%k!"(B
   1.411 +$B$H(B Mercurial $B$K$_$J$5$l$F$$$k$3$H$,$o$+$j$^$9!#(B
   1.412 +
   1.413 +\interaction{daily.rename.status-copy}
   1.414 +
   1.415 +\hgcmd{remove} $B$*$h$S(B \hgcmd{copy} $B$HF1MM$K!"(B
   1.416 +\hgopt{rename}{--after} $B%*%W%7%g%s$r;XDj$9$k$3$H$G!"(B
   1.417 +$B<B:]$K2~L>$7$?8e$G(B Mercurial $B$K$=$N;]$rDLCN$9$k$3$H$,$G$-$^$9!#(B
   1.418 +$B$=$l0J30$NKX$I$NE@$G!"(B
   1.419 +\hgcmd{rename} $B%3%^%s%I$N?6$kIq$$JB$S$K;XDj2DG=$J%*%W%7%g%s$O!"(B
   1.420 +\hgcmd{copy} $B%3%^%s%I$HF1$8$G$9!#(B
   1.421 +
   1.422 +\subsection{Renaming files and merging changes}
   1.423 +
   1.424 +Mercurial $B$N2~L>$,!VJ#@=$H:o=|!W$H$7$F<BAu$5$l$F$$$k$?$a!"(B
   1.425 +$BJ#@=$N8e$G$N%^!<%8$N>l9g$HF1MM$K!"(B
   1.426 +$B2~L>$N8e$G%^!<%8$r$7$?>l9g$K$OJQ99$,EAGE$5$l$^$9!#(B
   1.427 +
   1.428 +$B$"$k%f!<%6$,%U%!%$%k$r=$@5$7!"(B
   1.429 +$BJL$N%f!<%6$,$=$N%U%!%$%k$rJL$J%U%!%$%k$K2~L>$7$?>l9g!"(B
   1.430 +$BN><T$,$*8_$$$NJQ99$r%^!<%8$9$k$H!"(B
   1.431 +$B0lJ}$,9T$C$?2~L>85%U%!%$%k$X$N=$@5$O2~L>@h%U%!%$%k$X$HEAGE$7$^$9(B
   1.432 +$B!J$3$N?6$kIq$$$O(B``$BIaDL$N:n6H(B''$B$G4|BT$9$k$G$"$m$&N`$N$b$N$G$9$,!"(B
   1.433 +$BA4$F$N9=@.4IM}%7%9%F%`$,$3$N$h$&$K?6Iq$&$o$1$G$O$"$j$^$;$s!K!#(B
   1.434 +
   1.435 +$BJ#@=@h$KBP$9$kJQ99$NEAGE$,!"(B
   1.436 +$BMxMQ<T$K$H$C$F$*$=$i$/M-MQ$H;W$o$l$k5!G=$G$9$+$i!"(B
   1.437 +$B%U%!%$%k$N2~L>$K$*$$$F$bJQ99$NEAGE$,=EMW$G$"$m$&$3$H$O!"(B
   1.438 +$BL@$i$+$H$$$($k$G$7$g$&!#(B
   1.439 +$BJQ99EAGE5!G=$,L5$$>l9g!"(B
   1.440 +$B%U%!%$%k$N2~L>$K$h$C$FJQ99$O4JC1$K9T$/@h$r<:$C$F$7$^$&$3$H$G$7$g$&!#(B
   1.441 +
   1.442 +\subsection{Divergent renames and merging}
   1.443 +
   1.444 +$BL>A0$N9-$,$j!J(Bdiverging names$B!K$O!"(B
   1.445 +$BFs?M$N3+H/<T$,$H$"$k%U%!%$%k(B---
   1.446 +$B$3$l$r(B \filename{foo} $B$H8F$S$^$9(B---
   1.447 +$B$r3F<+$N%j%]%8%H%j$G07$&$3$H$GH/@8$7$^$9!#(B
   1.448 +
   1.449 +\interaction{rename.divergent.clone}
   1.450 +
   1.451 +Anne $B$,%U%!%$%k$r(B \filename{bar} $B$K2~L>$7$^$9!#(B
   1.452 +
   1.453 +\interaction{rename.divergent.rename.anne}
   1.454 +
   1.455 +$B$=$N0lJ}$G!"(BBob $B$,%U%!%$%k$r(B \filename{quux} $B$K2~L>$7$^$9!#(B
   1.456 +
   1.457 +\interaction{rename.divergent.rename.bob}
   1.458 +
   1.459 +$B8D!9$N3+H/<T$,%U%!%$%k$NL?L>$K4X$9$k0[$J$k0U8~$rI=L@$7$?$o$1$G$9$+$i!"(B
   1.460 +$BI.<T$O$3$N;vBV$r>WFM$HB*$($k$N$,NI$$$H;W$$$^$9!#(B
   1.461 +
   1.462 +$B$3$N>l9g$N%^!<%8$O$I$N$h$&$K?6Iq$&$Y$-$@$H;W$$$^$9$+!)(B
   1.463 +$B2~L>$K$h$k;^J,$+$l$,@8$8$k%A%'%s%8%;%C%H$N%^!<%8$N>l9g!"(B
   1.464 +Merging $B$O>o$K(B\emph{$BN>J}(B}$B$N2~L>@h%U%!%$%k$r0];}$7$^$9!#(B
   1.465 +
   1.466 +\interaction{rename.divergent.merge}
   1.467 +
   1.468 +$BI.<T8D?M$K$H$C$F$3$N?6$kIq$$$OBgJQ0U30$G$"$j!"(B
   1.469 +$B$=$l$,$3$3$G$3$N?6$kIq$$$r@bL@$7$F$$$kM}M3$G$b$"$j$^$9!#(B
   1.470 +$BI.<T$O(B Mercurial $B$K!"(B
   1.471 +\filename{bar} $B$r;D$9$+!"(B
   1.472 +\filename{quux} $B$r;D$9$+!"(B
   1.473 +$B$"$k$$$ON>J}$r;D$9$+!"(B
   1.474 +$B$H$$$&A*Br;h$K$h$k3NG'$r9T$&$3$H$r4|BT$7$F$$$?$N$G$9!#(B
   1.475 +
   1.476 +$B<B:]$K$O!"(B
   1.477 +$B%U%!%$%k$N2~L>$r9T$C$?>l9g!"(B
   1.478 +$B2~L>85%U%!%$%k$r;HMQ$7$?%S%k%I$r9T$&B>$N%U%!%$%k(B
   1.479 +$B!JNc$($P(B makefile$B!K$N=$@5$,9T$o$l$k$G$"$m$&$3$H$r0UL#$7$^$9!#(B
   1.480 +$B$=$N$?$a!"(B
   1.481 +Anne $B$,%U%!%$%k$r2~L>$7!"(B
   1.482 +$B2~L>8e$N%U%!%$%k$G%S%k%I$,<B;\$5$l$k$h$&$K(B
   1.483 +\filename{Makefile} $B$r=$@5$7$?>l9g!"(B
   1.484 +$B0lJ}$G(B Bob $B$,F1MM$N=$@5$rJL$JL>A0$G9T$C$F$$$^$9$+$i!"(B
   1.485 +$B%^!<%8$N:]$K$O:n6HNN0h%G%#%l%/%H%j$K0[$J$kL>A0$N%U%!%$%k$N%3%T!<$,B8:_$7!"(B
   1.486 +\emph{$B3n$D(B} Anne $B$H(B Bob $B$N(B
   1.487 +\filename{Makefile} $B$X$N=$@52U=j$,>WFM$7$F$$$kH&$G$9!#(B
   1.488 +
   1.489 +$BB>$NMxMQ<T$b$3$N?6$kIq$$$K0U30@-$r46$8$F$$$k$h$&$G$9!#(B
   1.490 +$B>\:Y$O(B \bug{455} $B$r;2>H$7$F$/$@$5$$!#(B
   1.491 +
   1.492 +\subsection{Convergent renames and merging}
   1.493 +
   1.494 +$B0[$J$k(B\emph{$BJ#@=85(B}$B%U%!%$%k$,F1$8%U%!%$%k$r(B\emph{$BJ#@=@h(B}$B$H$7$?:]$K!"(B
   1.495 +$B2~L>$K$h$kJL$J<oN`$N>WFM$,H/@8$7$^$9!#(B
   1.496 +$B$3$N>l9g!"(BMercurial $B$ODL>o$N%^!<%85!9=$r;HMQ$7!"(B
   1.497 +$BE,@Z$J2r7h$X$NM6F3$rMW5a$7$F$-$^$9!#(B
   1.498 +
   1.499 +\subsection{Other name-related corner cases}
   1.500 +
   1.501 +Mercurial $B$O!"(B
   1.502 +$B0lJ}$,%U%!%$%k$K;HMQ$7$?L>A0$rB>J}$,%G%#%l%/%H%j$K;HMQ$7$?>l9g$K!"(B
   1.503 +$B%^!<%8$,<:GT$9$k%P%0$,D9$$4V;D$C$F$$$^$9!#(B
   1.504 +$B$3$NLdBj$O(B \bug{29} $B$K>\:Y$,$"$j$^$9!#(B
   1.505 +
   1.506 +\interaction{issue29.go}
   1.507 +
   1.508 +\section{Recovering from mistakes}
   1.509 +
   1.510 +$B4v$D$+$N$"$j$,$A$J4V0c$$$+$iI|5l$9$k$?$a$K!"(B
   1.511 +Mercurial $B$OM-MQ$J%3%^%s%I$r4v$D$+Ds6!$7$F$$$^$9!#(B
   1.512 +
   1.513 +\hgcmd{revert} $B%3%^%s%I$O!"(B
   1.514 +$B:n6HNN0h%G%#%l%/%H%j$KBP$9$kJQ99$r<h$j>C$7$^$9!#(B
   1.515 +$BNc$($P!"$&$C$+$j%U%!%$%k$r(B \hgcmd{add} $B$7$F$7$^$C$?>l9g$K!"(B
   1.516 +$BDI2C$7$F$7$^$C$?%U%!%$%kL>$r;XDj$7$F(B
   1.517 +\hgcmd{revert} $B$r<B9T$9$k$3$H$G!"(B
   1.518 +$B%U%!%$%k$K$O0l@ZJQ99$r2C$($k;vL5$/(B
   1.519 +Mercurial $B$K$h$k9=@.4IM}BP>]$+$i=|30$9$k$3$H$,$G$-$^$9!#(B
   1.520 +$B%U%!%$%k$X$N4V0c$C$?JQ99$r<h$j>C$9$N$K$b(B
   1.521 +\hgcmd{revert} $B$,MxMQ$G$-$^$9!#(B
   1.522 +
   1.523 +\hgcmd{revert} $B%3%^%s%I$OL$%3%_%C%H$JJQ99$KBP$7$FM-8z$G$"$k!"(B
   1.524 +$B$H$$$&$3$H$O21$($F$*$-$^$7$g$&!#(B
   1.525 +$BC"$7!"(B
   1.526 +$B0lC6JQ99$r%3%_%C%H$7$?8e$GJQ99FbMF$,4V0c$$$G$"$k$3$H$K5$$,IU$$$?>l9g$G$b!"(B
   1.527 +$BA*Br;h$O8B$i$l$F$O$$$^$9$,BP=h$9$k$3$H$O$G$-$^$9!#(B
   1.528 +
   1.529 +\hgcmd{revert} $B%3%^%s%I$K4X$9$k>\:Y$H!"(B
   1.530 +$B%3%_%C%H:Q$_$NJQ99$K4X$9$kBP=h$N>\:Y$K4X$7$F$O!"(B
   1.531 +\ref{chap:undo}~$B>O$r;2>H$7$F$/$@$5$$!#(B
   1.532 +
   1.533 +%%% Local Variables: 
   1.534 +%%% mode: latex
   1.535 +%%% TeX-master: "00book"
   1.536 +%%% End: