hgbook
view ja/daily.tex @ 912:67af12ba4e26
Align new comments to the left too.
| author | dukebody <dukebody@gmail.com> |
|---|---|
| date | Tue Oct 27 00:15:51 2009 +0100 (2009-10-27) |
| parents | |
| children |
line source
1 \chapter{Mercurial in daily use}
2 \label{chap:daily}
4 \section{Telling Mercurial which files to track}
6 $B%U%!%$%k$N4IM}$r;X<($7$J$$8B$j!"(B
7 $B%j%]%8%H%jCf$N%U%!%$%k$KBP$7$F(B Mercurial $B$O2?$b9T$$$^$;$s!#(B
8 \hgcmd{status} $B%3%^%s%I$O!"(B
9 Mercurial $B$N4IM}2<$KL5$$%U%!%$%k$r(B
10 ``\texttt{?}'' $B$rI=<($9$k$3$H$GCN$i$;$F$/$l$^$9(B
12 Mercurial $B$K$h$k9=@.4IM}$r;X<($9$k$K$O!"(B
13 \hgcmd{add} $B%3%^%s%I$r;HMQ$7$^$9!#(B
14 $B%U%!%$%k$N9=@.4IM}$r;X<($7$?%U%!%$%k$N(B
15 \hgcmd{status} $B$K$h$kI=<($O!"(B
16 ``\texttt{?}'' $B$+$i(B ``\texttt{A}'' $B$X$HJQ2=$7$^$9!#(B
18 \interaction{daily.files.add}
20 \hgcmd{commit} $B$r<B9T$7$?D>8e$O!"(B
21 $B%3%_%C%HA0$KDI2C$7$?%U%!%$%k$,(B
22 \hgcmd{status} $B$K$h$jI=<($5$l$k$3$H$O$"$j$^$;$s!#(B
23 $B$3$l$O!"(B
24 ``$B6=L#?<$$(B''$B%U%!%$%k(B---
25 $BJQ99$7$?$j!"(BMercurial $B$K2?$i$+$NA`:n$rMW5a$7$?%U%!%$%k(B
26 ---$B$K$D$$$FI=<($9$k$N$,(B
27 \hgcmd{status} $B$NLr3d$@$+$i$G$9!#(B
28 $B?t@i$N%U%!%$%k$+$i@.$k%j%]%8%H%j$,$"$k>l9g!"(B
29 $B9=@.4IM}$5$l$F$O$$$F$bFC$KJQ99$5$l$F$$$J$$%U%!%$%k$N0lMw(B
30 $B!J8e=R$9$k$h$&$K!"$=$N$h$&$J%U%!%$%k0lMw$N>pJs$rF@$k$3$H$b$G$-$^$9!K(B
31 $B$rM_$7$$$H;W$&$3$H$O5)$G$9!#(B
33 $B0lC6%U%!%$%k$rDI2C$7$?$H$7$F$b!"(B
34 $B$=$N%U%!%$%k$KBP$7$F(B Mercurial $B$O$9$0$K$O2?$b9T$$$^$;$s!#(B
35 $B$=$NBe$o$j!"(B
36 $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
37 Mercurial $B$O$=$l0J9_!"(B
38 $B9=@.4IM}2<$+$i=|30$9$k$^$G!"(B
39 $B%3%_%C%H$N:]$K$O>o$KEv3:%U%!%$%k$NJQ99>u67$r3NG'$7$^$9!#(B
41 \subsection{Explicit versus implicit file naming}
43 Mercurial $B$NM-MQ$J?6$kIq$$$H$7$F!"(B
44 Mercurial $B$N%3%^%s%I$K%G%#%l%/%H%jL>$r;XDj$7$?>l9g!"(B
45 $B$=$N;XDj$r(B
46 ``$BEv3:%G%#%l%/%H%jG[2<$NA4$F$N%U%!%$%k(B\footnote{$BLuCm(B:
47 $BEv3:%G%#%l%/%H%jD>2<$N%U%!%$%k$J$i$S$K!"(B
48 $B%5%V%G%#%l%/%H%j0J2<$N%U%!%$%kA4$F(B}$B$KBP$9$kA`:n$N<B;\(B''
49 $B$,MW5a$5$l$?$b$N$H$_$J$7$^$9!#(B
51 \interaction{daily.files.add-dir}
53 $B@h$NNc$G(B \filename{a}
54 $B%U%!%$%k$r9=@.4IM}BP>]$KDI2C$7$?:]$K$O!"(B
55 Mercurial $B$ODI2C$5$l$?%U%!%$%k$N%U%!%$%kL>$rI=<($7$F$$$^$;$s$,!"(B
56 $B$3$NNc$G$O(B
57 $B9=@.4IM}BP>]$KDI2C$5$l$?%U%!%$%k$rI=<($7$F$$$kE@$KCm0U$7$F$/$@$5$$!#(B
59 $B@h$NNc$G$O!"(B
60 $BDI2C$9$k%U%!%$%kL>$r%3%^%s%I%i%$%s$GL@<(E*$K;XDj$7$^$7$?$N$G!"(B
61 $B$=$N$h$&$J>l9g$OMxMQ<T<+?H$,<+J,$N?6$kIq$$$rM}2r$7$F$$$k$b$N$H$_$J$7!"(B
62 Mercurial $B$O2?$bI=<($7$^$;$s!#(B
64 $B$7$+$7!"(B
65 $B%G%#%l%/%H%jL>$r;XDj$9$k$3$H$G%U%!%$%kL>$r(B\emph{$B0E<((B}$B$7$?>l9g!"(B
66 Mercurial $B$OFCJL$KA`:nBP>]$H$J$C$?8D!9$N%U%!%$%kL>$rI=<($7$^$9!#(B
67 $B$3$&$9$k$3$H$G2?$,<B;\$5$l$?$N$+$,L@3N$K$J$k$?$a!"(B
68 $B$R$C$=$j$H$d$C$+$$$JLdBj$,H/@8$9$k2DG=@-$rDc8:$7$^$9!#(B
69 $B$3$N?6$kIq$$$OKX$I$N(B
70 Mercurial $B%3%^%s%I$K6&DL$7$F$$$^$9!#(B
72 \subsection{Aside: Mercurial tracks files, not directories}
74 $B%G%#%l%/%H%j$O(B Mercurial $B$K$h$k9=@.4IM}$NBP>]$K$O$J$j$^$;$s!#(B
75 $B$=$NBe$o$j!"(B
76 Mercurial $B$O%U%!%$%k$N%Q%9$r9=@.4IM}$7$^$9!#(B
77 $B%U%!%$%k$N@8@.$N:]$K$O!"(B
78 $B$=$l$K@hN)$C$F%Q%9$K4^$^$l$kB8:_$7$J$$%G%#%l%/%H%j$rA4$F:n@.$7$^$9!#(B
79 $B%U%!%$%k$N:o=|$N:]$K$O!"(B
80 $B:o=|$5$l$?%U%!%$%k$X$N%Q%9$K4^$^$l$k6u%G%#%l%/%H%j$rA4$F:o=|$7$^$9!#(B
81 $B$?$o$$$bL5$$$3$H$KJ9$3$($k$+$b$7$l$^$;$s$,!"(B
82 Mercurial $B$,40A4$K6u$C$]$N%G%#%l%/%H%j$r<h$j07$($J$$!"(B
83 $B$H$$$&>.$5$$$J$,$i$b<BMQ>e=EBg$J@-<A$r<($7$F$$$^$9!#(B
85 $B6u$N%G%#%l%/%H%j$,M-MQ$J$3$H$OLGB?$KL5$$$G$9$7!"(B
86 $BBEEv$J8z2L$rF@$k$?$a$N95$($a$J2sHrJ}K!$,$"$j$^$9!#(B
87 Empty directories are rarely useful, and there are unintrusive
88 workarounds that you can use to achieve an appropriate effect.
89 $B$=$l8N$K!"(B
90 $B6u$N%G%#%l%/%H%j$r07$&$3$H$K$h$k8BDjE*$JM-1W@-$,!"(B
91 $B$=$l$KI,MW$H$5$l$kJ#;($5$K8+9g$&$b$N$G$O$J$$!"(B
92 $B$H(B Mercurial $B$N3+H/?X$OH=CG$7$^$7$?!#(B
94 $B6u$N%G%#%l%/%H%j$r%j%]%8%H%j$G4IM}$7$?$$>l9g!"(B
95 $BJ#?t$N<B8=J}K!$,$"$j$^$9!#(B
96 $B#1$D$OEv3:%G%#%l%/%H%jD>2<$N(B``$B1#$7(B''$B%U%!%$%k$r(B
97 \hgcmd{add} $B$9$k$3$H$G$9!#(B
98 UNIX $B%i%$%/$J%7%9%F%`$G$O!"(B
99 $B%T%j%*%I!J(B``\texttt{.}''$B!K$G;O$^$kL>A0$N%U%!%$%k$O!"(B
100 $BKX$I$N%3%^%s%I$d(B GUI $B%D!<%k$+$i1#$7%U%!%$%k$H$7$F07$o$l$^$9!#(B
101 $B$3$N<jK!$r?^(B~\ref{ex:daily:hidden}$B$K<($7$^$9!#(B
103 \begin{figure}[ht]
104 \interaction{daily.files.hidden}
105 \caption{Simulating an empty directory using a hidden file}
106 \label{ex:daily:hidden}
107 \end{figure}
109 $B6u%G%#%l%/%H%j$rI,MW$H$9$k>l9g$N$b$&0l$D$N2r7hJ}K!$O!"(B
110 $B<+F02=$5$l$?%S%k%I%9%/%j%W%H$GI,MW$K$J$kETEY:n@.$9$k!"(B
111 $B$H$$$&$b$N$G$9!#(B
113 \section{How to stop tracking a file}
115 $B%j%]%8%H%j$K$H$C$FITMW$K$J$C$?(B\footnote{$BLuCm(B:
116 $B9=@.4IM}$NI,MW@-$,$J$/$J$C$?(B}$B%U%!%$%k$,$"$k>l9g$O!"(B
117 \hgcmd{remove} $B%3%^%s%I$r;HMQ$^$9!#(B
118 $B$3$N%3%^%s%I$O%U%!%$%k$r:o=|$7$D$D!"(B
119 Mercurial $B$K9=@.4IM}BP>]$+$i%U%!%$%k$r=|30$9$k;]$rDLCN$7$^$9!#(B
120 $B:o=|$5$l$?%U%!%$%k$O!"(B
121 \hgcmd{status} $B$N=PNO$G$O(B
122 ``\texttt{R}'' $BIU$-$GI=<($5$l$^$9!#(B
124 \interaction{daily.files.remove}
126 \hgcmd{remove} $B$K$h$k%U%!%$%k$N:o=|$r9T$&$H!"(B
127 $B:n6HNN0h%G%#%l%/%H%j$KF1L>$N%U%!%$%k$r:FEY:n@.$7$?$H$7$F$b!"(B
128 Mercurial $B$O$=$N%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$7$^$9!#(B
129 $BF1L>%U%!%$%k$r:F@8@.$7(B Mercurial $B$K$h$k9=@.4IM}$r9T$&>l9g$K$O!"(B
130 $BC1=c$K$=$N%U%!%$%k$r(B \hgcmd{add} $B$7$F$/$@$5$$!#(B
131 Mercurial $B$O?75,$K4IM}BP>]$K2C$($i$l$?%U%!%$%k$,!"(B
132 $B0JA04IM}$7$F$$$?F1L>$N%U%!%$%k$H$OL54X78$G$"$k$H$_$J$7$^$9!#(B
134 \subsection{Removing a file does not affect its history}
136 $B=EMW$J;v$G$9$N$G!"(B
137 \hgcmd{remove} $B%3%^%s%I$K$h$kA`:n$,;}$D1F6A$O#2$D$@$1$G$"$k!"(B
138 $B$HM}2r$7$F$/$@$5$$!#(B
140 \begin{itemize}
141 \item $B:n6HNN0h%G%#%l%/%H%j$+$i!"8=;~E@$N%U%!%$%k$r:o=|$7$^$9(B
143 \item Mercurial $B$KBP$7$F!"<!2s$N%3%_%C%H0J9_!"(B
144 $BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$9$k$h$&$KDLCN$7$^$9(B
146 \end{itemize}
148 \hgcmd{remove} $B%3%^%s%I$K$h$kA`:n$O!"(B
149 $B%U%!%$%k$N(B\emph{$BJQ99MzNr(B}$B$K$O0l@ZJQ99$r2C$((B\emph{$B$^$;$s(B}$B!#(B
151 $B:n6HNN0h%G%#%l%/%H%j$r(B
152 \hgcmd{remove}
153 $B$G:o=|$7$?%U%!%$%k$,$^$@9=@.4IM}$5$l$F$$$?;~E@$N%A%'%s%8%;%C%H$G99?7$7$?>l9g!"(B
154 $B$=$N%A%'%s%8%;%C%H$,%3%_%C%H$5$l$?;~E@$NFbMF$G!"(B
155 $B:n6HNN0h%G%#%l%/%H%j$KEv3:%U%!%$%k$,:F@8@.$5$l$^$9!#(B
156 $B$=$N8e$G!"(B
157 $BEv3:%U%!%$%k$,(B \hgcmd{remove}
158 $B$G:o=|$5$l$?;~E@$N%A%'%s%8%;%C%H$G99?7$9$k$H!"(B
159 Mercurial $B$O:F$SEv3:%U%!%$%k$r:n6HNN0h$+$i:o=|$7$^$9!#(B
161 \subsection{Missing files}
163 \hgcmd{remove}
164 $B%3%^%s%I$r;HMQ$;$:$K:n6HNN0h%G%#%l%/%H%j$+$i:o=|$7$?%U%!%$%k$r!"(B
165 Mercurial $B$O(B\emph{$B9TJ}ITL@(B}$B$H$_$J$7$^$9!#(B
166 $B9TJ}ITL@$N%U%!%$%k$O!"(B
167 \hgcmd{status} $B$N=PNO$G$O(B
168 ``\texttt{!}'' $BIU$-$GI=<($5$l$^$9!#(B
169 Mercurial $B$N%3%^%s%I72A4HL$O!"(B
170 $B9TJ}ITL@$N%U%!%$%k$K4X$7$F$O2?$b9T$$$^$;$s!#(B
172 \interaction{daily.files.missing}
174 \hgcmd{status}
175 $B$,9TJ}ITL@$H$7$FI=<($9$k%U%!%$%k$,%j%]%8%H%jCf$K$"$k>l9g(B\footnote{$BLuCm(B:
176 $B$D$^$j<jF0$G%U%!%$%k$r:o=|$7$?>l9g(B}$B!"(B
177 $B%U%!%$%k:o=|8e$NG$0U$N;~E@$G(B
178 \hgcmdargs{remove}{\hgopt{remove}{--after}} $B$r<B9T$9$k$3$H$G(B
179 $BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$9$k0U;W$,$"$k$3$H$r(B
180 Mercurial $B$KDLCN$9$k$3$H$,$G$-$^$9!#(B
182 \interaction{daily.files.remove-after}
184 $B$=$N0lJ}$G!"(B
185 $B9TJ}ITL@$H$5$l$F$$$k%U%!%$%k$,0U?^$;$:$K:o=|$7$F$7$^$C$?$b$N$J$i!"(B
186 \hgcmd{revert} $B$KEv3:%U%!%$%kL>$r;XDj$9$k$3$H$G!"(B
187 $BJQ99$5$l$F$$$J$$>uBV$K%U%!%$%k$rI|5l$9$k$3$H$,$G$-$^$9!#(B
189 \interaction{daily.files.recover-missing}
191 \subsection{Aside: why tell Mercurial explicitly to remove a file?}
193 $B%U%!%$%k:o=|$N0U;WI=<($r0l!9(B Mercurial $B$K<($9I,MW@-$K$D$$$F!"(B
194 $B5?Ld$K;W$o$l$k$+$b$7$l$^$;$s!#(B
195 Mercurial $B$N3+H/=i4|$K$*$1$k:o=|J}K!$O!"(B
196 $B$=$N$h$&$K;W$&?M$K$H$C$F$OK>$^$7$$$b$N$+$b$7$l$^$;$s!#(B
197 Mercurial $B$O(B \hgcmd{commit} $B%3%^%s%I<B9T;~$K%U%!%$%k$NIT:_$r<+F0E*$K8!CN$7!"(B
198 $BEv3:%U%!%$%k$r9=@.4IM}BP>]$+$i=|30$7$F$$$?$N$G$9!#(B
199 $B<B:]LdBj!"$3$N:o=|J}K!$G$O!"(B
200 $BITN8$N;vBV$GDLCN$bL5$/%U%!%$%k$,:o=|$5$l$k;vBV$,MF0W$K5/$3$jF@$^$9!#(B
202 \subsection{Useful shorthand---adding and removing files in one step}
204 Mercurial $B$O!"(B
205 $B9=@.4IM}BP>]$X$N%U%!%$%k$NDI2C$H=|30$r9T$&!"(B
206 $BAH$_9g$o$;%3%^%s%I$G$"$k(B \hgcmd{addremove} $B$rDs6!$7$F$$$^$9!#(B
208 \interaction{daily.files.addremove}
210 \hgcmd{commit} $B%3%^%s%I$b!"(B
211 $B%3%_%C%H<B;\$ND>A0$K(B
212 \hgcmd{addremove} $B$HF1$8J}?K$G9=@.4IM}BP>]$X$NDI2C!?=|30$r9T$&(B
213 \hgopt{commit}{-A} $B%*%W%7%g%s$rDs6!$7$F$$$^$9!#(B
215 \interaction{daily.files.commit-addremove}
217 \section{Copying files}
219 Mercurial $B$O%U%!%$%k$NJ#@=$r9T$&(B
220 \hgcmd{copy} $B%3%^%s%I$rDs6!$7$F$$$^$9!#(B
221 $B$3$N%3%^%s%I$G%U%!%$%k$rJ#@=$7$?>l9g!"(B
222 Mercurial $B$O$=$N%U%!%$%k$,85%U%!%$%k$NJ#@=$G$"$k$3$H$r5-O?$7$^$9!#(B
223 $B%A%'%s%8%;%C%H$N%^!<%8$N:]$K$O!"(B
224 Mercurial $B$O$3$NJ#@=%U%!%$%k$rFCJL07$$$7$^$9!#(B
226 \subsection{The results of copying during a merge}
228 $BJ#@=%U%!%$%k$N%^!<%8$N:]$K$O!"(B
229 $BJQ99FbMF$,J#@=%U%!%$%k$^$G(B``$BDI=>(B''$B$7$F$-$^$9!#(B
230 $B$3$N$3$H$,;}$D0UL#$r>e<j$/@bL@$9$k$?$a$K!"(B
231 $B4JC1$JNc$r:n@.$7$^$7$g$&!#(B
232 $B$3$l$^$G$NNc$HF1MM$K!"(B
233 $B#1$D$@$1%U%!%$%k$r;}$D4J0WE*$J%j%]%8%H%j$r:n@.$7$^$9!#(B
235 \interaction{daily.copy.init}
237 $B%^!<%8$r9T$&$?$a$K$O!"(B
238 $BJL!9$N:n6H$rJ?9T$7$F9T$&I,MW$,$"$j$^$9$N$G!"(B
239 $B%j%]%8%H%j$rJ#@=$7$^$7$g$&!#(B
241 \interaction{daily.copy.clone}
243 $B:G=i$N%j%]%8%H%j$KLa$j!"(B
244 \hgcmd{copy} $B%3%^%s%I$G:G=i$K:n@.$7$?%U%!%$%k$rJ#@=$7$^$9!#(B
246 \interaction{daily.copy.copy}
248 $BJ#@=8e$N(B \hgcmd{status} $B%3%^%s%I$N=PNO$G$O!"(B
249 $BJ#@=$5$l$?%U%!%$%k$OC1$KDI2C$5$l$?IaDL$N%U%!%$%k$HF1$8$h$&$K8+$($^$9!#(B
251 \interaction{daily.copy.status}
253 $B$7$+$7(B
254 \hgopt{status}{-C} $B%*%W%7%g%sIU$-$G(B
255 \hgcmd{status} $B$r<B9T$9$k$3$H$G!"(B
256 $BJL$J9T$,I=<($5$l$^$9!#(B
257 $B$3$N9T$O!"?7$?$KDI2C$5$l$?%U%!%$%k$NJ#@=(B\emph{$B85(B}$B$G$"$k$3$H$r0UL#$7$^$9!#(B
259 \interaction{daily.copy.status-copy}
261 $BJ#@=$7$?%j%]%8%H%j$KLa$j!"(B
262 $BJ?9T$7$FJQ99:n6H$r9T$$$^$9!#(B
263 $BJ#@=85$K$J$C$?%U%!%$%k$KBP$7$F9T$rDI2C$7$^$9!#(B
265 \interaction{daily.copy.other}
267 $B$3$N%j%]%8%H%j$G$OJ#@=85$N(B \filename{file} $B$,JQ99$5$l$^$7$?!#(B
268 $B:G=i$N%j%]%8%H%j$+$iJQ99FbMF$r(B
269 \hgcmd{pull} $B$7$F#2$D$N(B head $B$r%^!<%8$9$k:]$K(B Mercurial $B$O!"(B
270 \filename{file} $B$KBP$7$F$@$19T$C$?JQ99FbMF$r!"(B
271 $B$=$NJ#@=$G$"$k(B \filename{new-file} $B$K$^$GEAGE$5$;$^$9!#(B
273 \interaction{daily.copy.merge}
275 \subsection{Why should changes follow copies?}
276 \label{sec:daily:why-copy}
278 $B%U%!%$%k$NJ#@=$KBP$7$F$kJQ99$,EAGE$5$l$k5sF0$O!"(B
279 $BFq2r$K;W$($k$+$b$7$l$^$;$s$,!"(B
280 $BB?$/$N>l9g$OHs>o$K9%$^$7$$?6$kIq$$$H$J$j$^$9!#(B
282 $B$^$:$O!"(B
283 $B$3$NEAGE$,%^!<%8$N;~(B\emph{$B$@$1(B}$B$K9T$o$l$k!"(B
284 $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
285 $B%U%!%$%k$r(B \hgcmd{copy} $B$GJ#@=$7!"(B
286 $B$=$l$K0z$-B3$-J#@=85%U%!%$%k$rJQ99$9$k!"(B
287 $B$H$$$&DL=j$N:n6H$K$*$$$F$O2?$bFCJL$J$3$H$O9T$o$l$^$;$s!#(B
289 $B$b$&0lE@!"(B
290 $BJQ99$r<h$j9~$s$@%j%]%8%H%j$,!"(B
291 $B%U%!%$%k$rJ#@=$7$?$3$H$r(B\emph{$BCN$i$J$+$C$?(B}$B>l9g$K8B$j!"(B
292 $BJQ99FbMF$,J#@=@h%U%!%$%k$KEAGE$9$k!"(B
293 $B$H$$$&$3$H$K$bCm0U$7$F$/$@$5$$!#(B
295 Mercurial $B$,$3$N$h$&$K?6Iq$&$N$O0J2<$N$h$&$JM}M3$N$?$a$G$9!#(B
296 $BNc$($PI.<T$,!"(B
297 $B%=!<%9%U%!%$%k$KBP$7$F=EMW$J%P%0=$@5$r9T$$!"(B
298 $BJQ99FbMF$r%3%_%C%H$7$?$H$7$^$9!#(B
299 $B$=$NJQ99:n6H$,9T$o$l$F$$$k4V$K!"(B
300 $B%P%0$N82:_2=$d$=$N=$@5$rBT$D;vL5$/!"(B
301 $BEv3:%U%!%$%k$r(B \hgcmd{copy} $B$GJ#@=$7!"(B
302 $B$=$NJ#@=@h%U%!%$%k$NJQ99$rFI<T$,;O$a$F$7$^$&$+$b$7$l$^$;$s!#(B
304 $BFI<T$,I.<T$NJQ99$r<h$j9~$s$G%^!<%8$7$?:]$K!"(B
305 Mercurial $B$,J#@=$X$NJQ99$NH?1G$r(B\emph{$B9T$o$J$$(B}$B>l9g!"(B
306 $BFI<T$NJ#@=@h%U%!%$%k$O%P%0$r4^$s$G$$$k$?$a!"(B
307 $B<jF0$G%P%0=$@5$rH?1G$5$;$kI,MW@-$r;W$$=P$5$J$$8B$j!"(B
308 $B%P%0$OJ#@=@h%U%!%$%k$K(B\emph{$B;D$jB3$1$k(B}$B$G$7$g$&!#(B
310 $B%P%0=$@5$K4X$9$kJQ99FbMF$N!"(B
311 $BJ#@=85$+$iJ#@=@h$X$N<+F0H?1G$K$h$j!"(B
312 Mercurial $B$O$3$N<j$NLdBj$r2sHr$7$F$$$^$9!#(B
313 $BI.<T$NCN$k8B$j(B Mercurial $B$O!"(B
314 $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
316 $B%U%!%$%k$NJ#@=$H$=$l$KB3$/%^!<%8$N<B;\$,0lC6JQ99MzNr$K5-O?$5$l$?$J$i!"(B
317 $BJ#@=85%U%!%$%k$+$iJ#@=@h%U%!%$%k$X$N$=$l0J>e$NJQ99H?1G$ODL>o$OITMW$J$N$G!"(B
318 Mercurial $B$O%^!<%8;~E@$^$G$OJ#@=$XJQ99$rEAGE$5$;$^$9$,!"(B
319 $B$=$l0J>e$O9T$$$^$;$s!#(B
321 \subsection{How to make changes \emph{not} follow a copy}
323 $B2>$K!"2?$i$+$NM}M3$K$h$j!"(B
324 $BJ#@=%U%!%$%k$X$N<+F0E*$JJQ99H?1G$,I,MW$J$$$HH=CG$7$?$J$i!"(B
325 $B%7%9%F%`$NDL>o$NJ}K!(B
326 $B!J(BUnix $BE*$J%7%9%F%`$N>l9g$J$i(B \command{cp}$B!K(B
327 $B$G%U%!%$%k$rJ#@=$7!"(B
328 \hgcmd{add} $B$K$h$j<jF0$GJ#@=%U%!%$%k$r9=@.4IM}BP>]$KDI2C$7$F$/$@$5$$!#(B
329 $B$G$9$,!"$=$NA0$K(B\ref{sec:daily:why-copy}$B@a$rFI$_D>$7$F!"(B
330 Mercurial $B$K$h$k<+F0JQ99H?1G$NE,@Z@-$r==J,$K8!F$$7$F$/$@$5$$!#(B
332 \subsection{Behaviour of the \hgcmd{copy} command}
334 \hgcmd{copy} $B%3%^%s%I$r;HMQ$7$?>l9g!"(B
335 Mercurial $B$OB(:B$K:n6HNN0h%G%#%l%/%H%j$K8D!9$N%U%!%$%k$NJ#@=$r:n@.$7$^$9!#(B
336 $B$=$N$?$a!"(B
337 $B%U%!%$%k$K=$@5$r2C$($?8e$G!"(B
338 $B$=$NJQ99$r%A%'%s%8%;%C%H$H$7$F%3%_%C%H$9$k$3$H$J$/(B
339 \hgcmd{copy} $B$r9T$C$?>l9g!"(B
340 $BJ#@=@h%U%!%$%k$O$=$N;~E@$^$G$NJQ99FbMF$b4^$s$G$$$k$3$H$K$J$j$^$9(B
341 $B!J$3$N?6$kIq$$$K$D$$$F$3$3$G=R$Y$?$N$O!"(B
342 $B>/!9D>46$KH?$9$k$h$&$K46$8$i$l$?$+$i$G$9!K!#(B
344 \hgcmd{copy} $B$O(B
345 Unix $B$N(B \command{cp} $B%3%^%s%I$HF1MM$K?6Iq$$$^$9(B
346 $B!J(B\hgcmd{cp} $B$H$$$&JLL>J}$,9%$_$G$"$l$P!"$3$A$i$b;HMQ$G$-$^$9!K!#(B
347 $BKvHx$N0z?t$O(B\emph{$BJ#@=@h(B}$B$r!"(B
348 $B$=$l0J30$N@h9T$9$k0z?t$O(B\emph{$BJ#@=85(B}$B$r0UL#$7$^$9!#(B
349 $BJ#@=85$KC10l$N%U%!%$%k$r!"(B
350 $BJ#@=@h$KB8:_$7$J$$%Q%9$r;XDj$7$?>l9g!"(B
351 Mercurial $B$OJ#@=@h$K;XDj$7$?L>A0$G?7$?$J%U%!%$%k$r@8@.$7$^$9!#(B
353 \interaction{daily.copy.simple}
355 $BJ#@=@h$,%G%#%l%/%H%j$N>l9g!"(B
356 Mercurial $B$OJ#@=85%U%!%$%k$rEv3:%G%#%l%/%H%j$KJ#@=$7$^$9!#(B
358 \interaction{daily.copy.dir-dest}
360 $B%G%#%l%/%H%j$NJ#@=$N>l9g$O!"(B
361 $B:F5"E*3n$D%G%#%l%/%H%j9=@.$rJ];}$7$D$DJ#@=$5$l$^$9!#(B
363 \interaction{daily.copy.dir-src}
365 $BJ#@=85$HJ#@=@h$NN>J}$,%G%#%l%/%H%j$N>l9g(B\footnote{$BLuCm(B:
366 $B@h$N!V%G%#%l%/%H%j$NJ#@=$N>l9g!W$O!"(B
367 $B!VJ#@=@h%G%#%l%/%H%j$,B8:_$7$J$$>l9g!W$r;X$7$^$9!#(B}$B!"(B
368 $BJ#@=85$N%G%#%l%/%H%j9=B$$O!"(B
369 $BJ#@=@h%G%#%l%/%H%jG[2<$G:F9=C[$5$l$^$9!#(B
371 \interaction{daily.copy.dir-src-dest}
373 $B<jF0$G%U%!%$%k$rJ#@=$7$?8e$G!"(B
374 $BEv3:%U%!%$%k$,J#@=$G$"$k$3$H$r(B Mercurial $B$KDLCN$9$k$K$O!"(B
375 \hgcmd{remove} $B$N>l9g$HF1MM$K!"(B
376 \hgopt{copy}{--after} $BIU$-$G(B \hgcmd{copy} $B%3%^%s%I$r;HMQ$7$^$9!#(B
378 \interaction{daily.copy.after}
380 \section{Renaming files}
382 $B%U%!%$%k$rJ#@=$9$k$h$j$b!"(B
383 $B$`$7$m2~L>$NJ}$,I,MW$H$5$l$k$N$G$O$J$$$G$7$g$&$+!#(B
384 $B%U%!%$%k$N2~L>$h$j$b(B
385 \hgcmd{copy} $B%3%^%s%I$NJ}$r@h$K@bL@$7$?$N$O!"(B
386 Mercurial $B$,J#@=$H2~L>$rK\<AE*$K$OF1Ey$K07$C$F$$$k$?$a$G$9!#(B
387 $B$=$N$?$a!"(B
388 $B%U%!%$%k$NJ#@=$K$*$1$k(B Mercurial $B$N5sF0$rCN$k$3$H$G!"(B
389 $B%U%!%$%k$N2~L>$G4|BT$5$l$k?6$kIq$$$rCN$k$3$H$,$G$-$^$9!#(B
391 \hgcmd{rename} $B%3%^%s%I$r;HMQ$7$?>l9g!"(B
392 Mercurial $B$O8D!9$N2~L>85%U%!%$%k$NJ#@=$r:n@.$7!"(B
393 $B$=$N>e$G2~L>85%U%!%$%k$r:o=|$7!"(B
394 $B$=$l$i$r9=@.4IM}BP>]$+$i=|30$7$^$9!#(B
396 \interaction{daily.rename.rename}
398 \hgcmd{status} $B%3%^%s%I$N=PNO$+$i!"(B
399 $B?7$?$KJ#@=$5$l$?%U%!%$%k$,9=@.4IM}BP>]$KDI2C$5$l!"(B
400 $B2~L>85%U%!%$%k$,=|30$5$l$F$$$k$3$H$,FI$_<h$l$^$9!#(B
402 \interaction{daily.rename.status}
404 \hgcmd{copy} $B<B9T$N>l9g$HF1MM$K!"(B
405 \hgopt{status}{-C} $B%*%W%7%g%sIU$-$G(B \hgcmd{status} $B%3%^%s%I$r<B9T$9$k$3$H$G!"(B
406 $B9=@.4IM}BP>]$KDI2C$5$l$?%U%!%$%k$,<B:]$K$O!"(B
407 $B:#$O:o=|$5$l$F$7$^$C$?%U%!%$%k$NJ#@=%U%!%$%k!"(B
408 $B$H(B Mercurial $B$K$_$J$5$l$F$$$k$3$H$,$o$+$j$^$9!#(B
410 \interaction{daily.rename.status-copy}
412 \hgcmd{remove} $B$*$h$S(B \hgcmd{copy} $B$HF1MM$K!"(B
413 \hgopt{rename}{--after} $B%*%W%7%g%s$r;XDj$9$k$3$H$G!"(B
414 $B<B:]$K2~L>$7$?8e$G(B Mercurial $B$K$=$N;]$rDLCN$9$k$3$H$,$G$-$^$9!#(B
415 $B$=$l0J30$NKX$I$NE@$G!"(B
416 \hgcmd{rename} $B%3%^%s%I$N?6$kIq$$JB$S$K;XDj2DG=$J%*%W%7%g%s$O!"(B
417 \hgcmd{copy} $B%3%^%s%I$HF1$8$G$9!#(B
419 \subsection{Renaming files and merging changes}
421 Mercurial $B$N2~L>$,!VJ#@=$H:o=|!W$H$7$F<BAu$5$l$F$$$k$?$a!"(B
422 $BJ#@=$N8e$G$N%^!<%8$N>l9g$HF1MM$K!"(B
423 $B2~L>$N8e$G%^!<%8$r$7$?>l9g$K$OJQ99$,EAGE$5$l$^$9!#(B
425 $B$"$k%f!<%6$,%U%!%$%k$r=$@5$7!"(B
426 $BJL$N%f!<%6$,$=$N%U%!%$%k$rJL$J%U%!%$%k$K2~L>$7$?>l9g!"(B
427 $BN><T$,$*8_$$$NJQ99$r%^!<%8$9$k$H!"(B
428 $B0lJ}$,9T$C$?2~L>85%U%!%$%k$X$N=$@5$O2~L>@h%U%!%$%k$X$HEAGE$7$^$9(B
429 $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
430 $BA4$F$N9=@.4IM}%7%9%F%`$,$3$N$h$&$K?6Iq$&$o$1$G$O$"$j$^$;$s!K!#(B
432 $BJ#@=@h$KBP$9$kJQ99$NEAGE$,!"(B
433 $BMxMQ<T$K$H$C$F$*$=$i$/M-MQ$H;W$o$l$k5!G=$G$9$+$i!"(B
434 $B%U%!%$%k$N2~L>$K$*$$$F$bJQ99$NEAGE$,=EMW$G$"$m$&$3$H$O!"(B
435 $BL@$i$+$H$$$($k$G$7$g$&!#(B
436 $BJQ99EAGE5!G=$,L5$$>l9g!"(B
437 $B%U%!%$%k$N2~L>$K$h$C$FJQ99$O4JC1$K9T$/@h$r<:$C$F$7$^$&$3$H$G$7$g$&!#(B
439 \subsection{Divergent renames and merging}
441 $BL>A0$N9-$,$j!J(Bdiverging names$B!K$O!"(B
442 $BFs?M$N3+H/<T$,$H$"$k%U%!%$%k(B---
443 $B$3$l$r(B \filename{foo} $B$H8F$S$^$9(B---
444 $B$r3F<+$N%j%]%8%H%j$G07$&$3$H$GH/@8$7$^$9!#(B
446 \interaction{rename.divergent.clone}
448 Anne $B$,%U%!%$%k$r(B \filename{bar} $B$K2~L>$7$^$9!#(B
450 \interaction{rename.divergent.rename.anne}
452 $B$=$N0lJ}$G!"(BBob $B$,%U%!%$%k$r(B \filename{quux} $B$K2~L>$7$^$9!#(B
454 \interaction{rename.divergent.rename.bob}
456 $B8D!9$N3+H/<T$,%U%!%$%k$NL?L>$K4X$9$k0[$J$k0U8~$rI=L@$7$?$o$1$G$9$+$i!"(B
457 $BI.<T$O$3$N;vBV$r>WFM$HB*$($k$N$,NI$$$H;W$$$^$9!#(B
459 $B$3$N>l9g$N%^!<%8$O$I$N$h$&$K?6Iq$&$Y$-$@$H;W$$$^$9$+!)(B
460 $B2~L>$K$h$k;^J,$+$l$,@8$8$k%A%'%s%8%;%C%H$N%^!<%8$N>l9g!"(B
461 Merging $B$O>o$K(B\emph{$BN>J}(B}$B$N2~L>@h%U%!%$%k$r0];}$7$^$9!#(B
463 \interaction{rename.divergent.merge}
465 $BI.<T8D?M$K$H$C$F$3$N?6$kIq$$$OBgJQ0U30$G$"$j!"(B
466 $B$=$l$,$3$3$G$3$N?6$kIq$$$r@bL@$7$F$$$kM}M3$G$b$"$j$^$9!#(B
467 $BI.<T$O(B Mercurial $B$K!"(B
468 \filename{bar} $B$r;D$9$+!"(B
469 \filename{quux} $B$r;D$9$+!"(B
470 $B$"$k$$$ON>J}$r;D$9$+!"(B
471 $B$H$$$&A*Br;h$K$h$k3NG'$r9T$&$3$H$r4|BT$7$F$$$?$N$G$9!#(B
473 $B<B:]$K$O!"(B
474 $B%U%!%$%k$N2~L>$r9T$C$?>l9g!"(B
475 $B2~L>85%U%!%$%k$r;HMQ$7$?%S%k%I$r9T$&B>$N%U%!%$%k(B
476 $B!JNc$($P(B makefile$B!K$N=$@5$,9T$o$l$k$G$"$m$&$3$H$r0UL#$7$^$9!#(B
477 $B$=$N$?$a!"(B
478 Anne $B$,%U%!%$%k$r2~L>$7!"(B
479 $B2~L>8e$N%U%!%$%k$G%S%k%I$,<B;\$5$l$k$h$&$K(B
480 \filename{Makefile} $B$r=$@5$7$?>l9g!"(B
481 $B0lJ}$G(B Bob $B$,F1MM$N=$@5$rJL$JL>A0$G9T$C$F$$$^$9$+$i!"(B
482 $B%^!<%8$N:]$K$O:n6HNN0h%G%#%l%/%H%j$K0[$J$kL>A0$N%U%!%$%k$N%3%T!<$,B8:_$7!"(B
483 \emph{$B3n$D(B} Anne $B$H(B Bob $B$N(B
484 \filename{Makefile} $B$X$N=$@52U=j$,>WFM$7$F$$$kH&$G$9!#(B
486 $BB>$NMxMQ<T$b$3$N?6$kIq$$$K0U30@-$r46$8$F$$$k$h$&$G$9!#(B
487 $B>\:Y$O(B \bug{455} $B$r;2>H$7$F$/$@$5$$!#(B
489 \subsection{Convergent renames and merging}
491 $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
492 $B2~L>$K$h$kJL$J<oN`$N>WFM$,H/@8$7$^$9!#(B
493 $B$3$N>l9g!"(BMercurial $B$ODL>o$N%^!<%85!9=$r;HMQ$7!"(B
494 $BE,@Z$J2r7h$X$NM6F3$rMW5a$7$F$-$^$9!#(B
496 \subsection{Other name-related corner cases}
498 Mercurial $B$O!"(B
499 $B0lJ}$,%U%!%$%k$K;HMQ$7$?L>A0$rB>J}$,%G%#%l%/%H%j$K;HMQ$7$?>l9g$K!"(B
500 $B%^!<%8$,<:GT$9$k%P%0$,D9$$4V;D$C$F$$$^$9!#(B
501 $B$3$NLdBj$O(B \bug{29} $B$K>\:Y$,$"$j$^$9!#(B
503 \interaction{issue29.go}
505 \section{Recovering from mistakes}
507 $B4v$D$+$N$"$j$,$A$J4V0c$$$+$iI|5l$9$k$?$a$K!"(B
508 Mercurial $B$OM-MQ$J%3%^%s%I$r4v$D$+Ds6!$7$F$$$^$9!#(B
510 \hgcmd{revert} $B%3%^%s%I$O!"(B
511 $B:n6HNN0h%G%#%l%/%H%j$KBP$9$kJQ99$r<h$j>C$7$^$9!#(B
512 $BNc$($P!"$&$C$+$j%U%!%$%k$r(B \hgcmd{add} $B$7$F$7$^$C$?>l9g$K!"(B
513 $BDI2C$7$F$7$^$C$?%U%!%$%kL>$r;XDj$7$F(B
514 \hgcmd{revert} $B$r<B9T$9$k$3$H$G!"(B
515 $B%U%!%$%k$K$O0l@ZJQ99$r2C$($k;vL5$/(B
516 Mercurial $B$K$h$k9=@.4IM}BP>]$+$i=|30$9$k$3$H$,$G$-$^$9!#(B
517 $B%U%!%$%k$X$N4V0c$C$?JQ99$r<h$j>C$9$N$K$b(B
518 \hgcmd{revert} $B$,MxMQ$G$-$^$9!#(B
520 \hgcmd{revert} $B%3%^%s%I$OL$%3%_%C%H$JJQ99$KBP$7$FM-8z$G$"$k!"(B
521 $B$H$$$&$3$H$O21$($F$*$-$^$7$g$&!#(B
522 $BC"$7!"(B
523 $B0lC6JQ99$r%3%_%C%H$7$?8e$GJQ99FbMF$,4V0c$$$G$"$k$3$H$K5$$,IU$$$?>l9g$G$b!"(B
524 $BA*Br;h$O8B$i$l$F$O$$$^$9$,BP=h$9$k$3$H$O$G$-$^$9!#(B
526 \hgcmd{revert} $B%3%^%s%I$K4X$9$k>\:Y$H!"(B
527 $B%3%_%C%H:Q$_$NJQ99$K4X$9$kBP=h$N>\:Y$K4X$7$F$O!"(B
528 \ref{chap:undo}~$B>O$r;2>H$7$F$/$@$5$$!#(B
530 %%% Local Variables:
531 %%% mode: latex
532 %%% TeX-master: "00book"
533 %%% End: