hgbook
view ja/tour-basic.tex @ 708:d6ca1334a19d
Japanese translation on a24b370a16ee
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Fri Jul 31 19:49:16 2009 +0900 (2009-07-31) |
| parents | |
| children |
line source
1 \chapter{A tour of Mercurial: the basics}
2 \label{chap:tour-basic}
4 \section{Installing Mercurial on your system}
5 \label{sec:tour:install}
7 $B0lHLE*$JA4$F$N(B OS $B8~$1$K!"(B
8 $B%S%k%I:Q$_$N(B Mercurial $B%P%$%J%jHG$,Ds6!$5$l$F$$$^$9!#(B
9 $B%P%$%J%jHG$r;HMQ$9$k$3$H$G!"(B
10 $B4JC1$K(B Mercurial $B$r%;%C%H%"%C%W$9$k$3$H$,$G$-$^$9!#(B
12 \subsection{Linux}
14 Linux $B%G%#%9%H%j%S%e!<%7%g%s$O!"(B
15 $B$=$l$>$l8GM-$N%Q%C%1!<%84IM}%D!<%k!"(B
16 $B%Q%C%1!<%8:n@.J}?K!"$J$i$S$K3+H/%Z!<%9$r;}$C$F$$$^$9$N$G!"(B
17 $BA4$F$N%P%$%J%jHG(B Mercurial
18 $B$N%$%s%9%H!<%k<j=g$K4X$9$kJq3gE*$J@bL@$r9T$&$N$O:$Fq$G$9!#(B
19 $B$^$?!"(B
20 $B%P%$%J%jHG$N%$%s%9%H!<%k$K$h$C$FMxMQ2DG=$J(B Mercurial $B$N%P!<%8%g%s$O!"(B
21 $BEv3:%G%#%9%H%j%S%e!<%7%g%s$N%Q%C%1!<%8J]<iC4Ev<T$,!"(B
22 $B$I$NDxEY3hH/$G$"$k$+$K$h$C$F0[$J$j$^$9!#(B
24 $B4JJX2=$N$?$a!"(B
25 $BCxL>$J(B Linux $B%G%#%9%H%j%S%e!<%7%g%s$K$*$1$k!"(B
26 $B%3%^%s%I%i%$%s$rMQ$$$?(B Mercurial $B$N%$%s%9%H!<%k$K8BDj$7$F@bL@$7$^$9!#(B
27 $BKX$I$N%G%#%9%H%j%S%e!<%7%g%s$G$O!"(B
28 \texttt{mercurial} $B$H$$$&L>A0$N%Q%C%1!<%8$rC5$7$?$J$i$P!"(B
29 $B%/%j%C%/$R$H$D$G(B Mercurial $B$,%$%s%9%H!<%k$G$-$k$h$&$J!"(B
30 $B%0%i%U%#%+%k$J%Q%C%1!<%84IM}%D!<%k$,Ds6!$5$l$F$$$^$9!#(B
32 \begin{description}
33 \item[Debian]
34 \begin{codesample4}
35 apt-get install mercurial
36 \end{codesample4}
38 \item[Fedora Core]
39 \begin{codesample4}
40 yum install mercurial
41 \end{codesample4}
43 \item[Gentoo]
44 \begin{codesample4}
45 emerge mercurial
46 \end{codesample4}
48 \item[OpenSUSE]
49 \begin{codesample4}
50 yum install mercurial
51 \end{codesample4}
53 \item[Ubuntu] Ubuntu $B$N(B Mercurial $B%Q%C%1!<%8$OHs>o$K8E$$$N$G!"(B
54 $B;HMQ$9$Y$-$G$O$"$j$^$;$s!#(B
55 $B$G$-$l$P!"(BDebian $B%Q%C%1!<%8$r%j%S%k%I$7$F%$%s%9%H!<%k$7$F$/$@$5$$!#(B
56 $B$*$=$i$/(B Mercurial $B$r%=!<%9$+$i%S%k%I$9$kJ}$,4JC1$G$7$g$&!#(B
57 $B$=$N>l9g$N>\:Y$O!"(B\ref{sec:srcinstall:unixlike}~$B@a$r;2>H$7$F$/$@$5$$!#(B
59 \end{description}
61 \subsection{Mac OS X}
63 Mac OS~X $B8~$1$N(B Mercurial $B%$%s%9%H!<%i$O!"(B
64 Lee Cantey $B$K$h$C$F(B
65 \url{http://mercurial.berkwood.com} $B$G8x3+$5$l$F$$$^$9!#(B
66 $B$3$N%Q%C%1!<%8$O!"(BIntel $B$*$h$S(B Power $B$NN>(B Mac $B$GF0:n$7$^$9!#(B
67 $B$3$N%$%s%9%H!<%i$r;HMQ$9$kA0$K!"(B
68 Universal MacPython~\cite{web:macpython}
69 $B$H8_49@-$N$"$k(B Python $B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#(B
70 Lee $B;a$N%5%$%H$K$"$k<j=g$rF'$a$P!"4JC1$K%$%s%9%H!<%k$G$-$^$9!#(B
72 \subsection{Solaris}
74 $BL$9;!#(BXXX
76 \subsection{Windows}
78 Windows $B8~$1$N(B Mercurial $B%$%s%9%H!<%i$O!"(B
79 Lee Cantey $B$K$h$C$F(B
80 \url{http://mercurial.berkwood.com} $B$G8x3+$5$l$F$$$^$9!#(B
81 $B$3$N%Q%C%1!<%8$OB>$N%Q%C%1!<%8$X$N0MB8@-$,$"$j$^$;$s$N$G!"(B
82 $BC1FH$GMxMQ$G$-$^$9!#(B
84 \begin{note}
85 $B4pDl>uBV$N(B Windows $BHG(B Mercurial $B$O!"(B
86 Windows $B$H(B Unix $B$N2~9T7A<0$N<+F0JQ49$O9T$$$^$;$s!#(B
87 Unix $BMxMQ<T$HJQ99@.2L$r6&M-$7$?$$>l9g$O!"(B
88 $B>/!9DI2C@_Dj$r9T$&I,MW$,$"$j$^$9!#(B
89 $B>\:YL$9;(B XXX$B!#(B
90 \end{note}
92 \section{Getting started}
94 Mercurial $B$r;H$$;O$a$k$K$"$?$j!"(B
95 $B<B:]$KMxMQ2DG=$J(B Mercurial $B%3%^%s%I$N%P!<%8%g%s$r3NG'$9$k$?$a!"(B
96 \hgcmd{version} $B%3%^%s%I$r;H$C$F$_$^$7$g$&!#(B
97 $B<B:]$N%P!<%8%g%s>pJs$K$O$=$l$[$I=EMW@-$O$"$j$^$;$s$,!"(B
98 $B2?$bI=<($5$l$J$$>l9g$OBP=h$,I,MW$G$9!#(B
100 \interaction{tour.version}
102 \subsection{Built-in help}
104 Mercurial $B$OAH$_9~$_%X%k%W5!G=$r;}$C$F$$$^$9!#(B
105 $B$3$N5!G=$O!"(B
106 $B%3%^%s%I$N<B9TJ}K!$r;W$$=P$;$J$$>l9g$KM-MQ$G$9!#(B
107 $B2?$r$7$FNI$$$N$+40A4$K$o$+$i$J$/$J$C$F$7$^$C$?>l9g$O!"(B
108 $BC1$K(B \hgcmd{help} $B$r<B9T$9$k$3$H$G!"(B
109 $B$=$l$>$l$,$I$N$h$&$J5!G=$r;}$C$F$$$k$+$N@bL@$,IU$$$?!"(B
110 $B4JC1$J%3%^%s%I0lMw$,I=<($5$l$^$9!#(B
111 $B0J2<$K<($9$h$&$J7A<0$G!"(B
112 $BFCDj$N%3%^%s%I$K$D$$$F(B \hgcmd{help} $B$r<B9T$7$?>l9g!"(B
113 $B$=$N%3%^%s%I$K4X$9$k>\:Y$J>pJs$,I=<($5$l$^$9!#(B
115 \interaction{tour.help}
117 $B99$KB?$/$N>\:Y$J!JDL>o$OI,MW$H$7$J$$!K>pJs$rI=<($9$k$K$O!"(B
118 \hgcmdargs{help}{\hggopt{-v}} $B$r<B9T$7$^$9!#(B
119 \hggopt{-v} $B%*%W%7%g%s$O(B \hggopt{--verbose} $B$N>JN,7A$G!"(B
120 $BDL>o$h$j$bB?$/$N>pJs$r(B Mercurial $B$KI=<($5$;$^$9!#(B
122 \section{Working with a repository}
124 Mercurial $B$G$O!"(B
125 $BA4$F$,(B\emph{$B%j%]%8%H%j(B}$B$KJD$8$F$$$^$9!#(B
126 $BNc$($P!"$"$k%W%m%8%'%/%H$N$?$a$K:n@.$7$?%j%]%8%H%j$K$O!"(B
127 $B%W%m%8%'%/%H$K(B``$BB0$9$k(B''$BA4$F$N%U%!%$%k$@$1$G$J$/!"(B
128 $B%U%!%$%k$K4X$9$kMzNr>pJs$b3JG<$5$l$F$$$^$9!#(B
130 $B%j%]%8%H%j$O%U%!%$%k%7%9%F%`>e$K$"$kB~$N%G%#%l%/%H%j%D%j!<$G$9$N$G!"(B
131 Mercurial $B$,FCJL07$$$9$k$H$$$&$3$H0J30$K$O!"(B
132 $BDL>o$N%G%#%l%/%H%j$d%U%!%$%k$HHf3S$7$FFC$KJQ$o$C$F$$$kE@$O$"$j$^$;$s!#(B
133 $B%3%^%s%I9T$d%U%!%$%k%V%i%&%6$rMxMQ$7$F!"(B
134 $BG$0U$N;~E@$G2~L>$d:o=|$9$k$3$H$,$G$-$^$9!#(B
136 \subsection{Making a local copy of a repository}
138 $B%j%]%8%H%j$N(B\emph{$BJ#@=(B}$B$O!">/!9FCJL$G$9!#(B
139 $BDL>o$N%G%#%l%/%H%jJ#@=$N%3%^%s%I$G$b%j%]%8%H%j$rJ#@=$G$-$^$9$,!"(B
140 Mercurial $BAH$_9~$_$NJ#@=%3%^%s%I$r;HMQ$7$?J}$,NI$$$G$7$g!#(B
141 $B$3$N%3%^%s%I$O!"(B
142 $B4{B8$N%j%]%8%H%j$HF10l$NJ#@=$r@8@.$9$k$?$a!"(B
143 \hgcmd{clone} $B$H8F$P$l$F$$$^$9!#(B
145 \interaction{tour.clone}
147 $B%A%e!<%H%j%"%kMQ$N%j%]%8%H%j$+$i$NJ#@=$K@.8y$7$?$J$i!"(B
148 $B%m!<%+%k%U%!%$%k%7%9%F%`>e$K(B
149 \dirname{hello} $B$H$$$&L>A0$N%G%#%l%/%H%j$,$"$kH&$G$9!#(B
150 $B$3$N%G%#%l%/%H%j$K$O%U%!%$%k$,4v$D$+3JG<$5$l$F$$$k$3$H$G$7$g$&!#(B
151 This directory will contain some files.
153 \interaction{tour.ls}
155 $B$3$l$i$N%U%!%$%k$O!"(B
156 $BJ#@=85$K$J$C$?%j%]%8%H%j$K$*$1$k%U%!%$%k$H!"(B
157 $BA4$/F1$8FbMF$HMzNr>pJs$r;}$C$F$$$^$9!#(B
159 $BA4$F$N(B Mercurial $B%j%]%8%H%j$O!"(B
160 $B5!G=Ds6!$KI,MW$J$b$N$rA4$F3JG<$7$F$$$k$?$a!"(B
161 $B$=$l<+BN$G407k$7$F$$$k!"FHN)$7$?B8:_$G$9!#(B
162 $B%j%]%8%H%j$K$O!"(B
163 $B%W%m%8%'%/%H$KB0$9$k%U%!%$%k$N;dE*$JJ#@=$HMzNr>pJs$,3JG<$5$l$^$9!#(B
164 $BJ#@=$5$l$?%j%]%8%H%j$O!"(B
165 $BJ#@=85$H$J$C$?%j%]%8%H%j$N0LCV$r5-21$7$F$$$^$9$,!"(B
166 $BFC$KL@<(E*$J;X<($r$7$J$$8B$j!"(B
167 $BJ#@=85%j%]%8%H%j$H$NO"7H!J$*$h$S!"$=$l0J30$N%j%]%8%H%j$H$NO"7H$b!K(B
168 $B$O9T$o$l$^$;$s!#(B
170 $B$=$l$>$l$N%j%]%8%H%j$O!"(B
171 $BB>$N%j%]%8%H%j$K1F6A$r5Z$\$9$3$H$NL5$$!"(B
172 $B;dE*$J(B``$BH"Dm(B''$B$H8@$($^$9$+$i!"(B
173 $B<+?H$N%j%]%8%H%j$G<+M3$K<B83$,$G$-$k$o$1$G$9!#(B
175 \subsection{What's in a repository?}
177 $B%j%]%8%H%jFbIt$r;F:Y$K8+$F$_$k$H!"(B
178 \dirname{.hg} $B$H$$$&L>A0$N%G%#%l%/%H%j$,$"$k$3$H$K5$$,IU$/$3$H$G$7$g$&!#(B
179 $B$3$N%G%#%l%/%H%j$O!"(B
180 Mercurial $B$,%j%]%8%H%j$N%a%?%G!<%?$r3JG<$7$F$$$k%G%#%l%/%H%j$G$9!#(B
182 \interaction{tour.ls-a}
184 \dirname{.hg} $B$*$h$S$=$NG[2<$N%G%#%l%/%H%j$NFbMF$O!"(B
185 Mercurial $B$,;dE*$K;HMQ$9$k$b$N$G$9!#(B
186 $B%j%]%8%H%j$K$*$1$k$=$l0J30$N%G%#%l%/%H%j!&%U%!%$%k$O!"(B
187 $B<+M3$KMxMQ$7$F9=$$$^$;$s!#(B
189 $BMQ8l$NDj5A$r$9$k$K$"$?$j!"(B
190 \dirname{.hg} $B%G%#%l%/%H%j$r(B``$BK\Ev$N(B''$B%j%]%8%H%j$H$9$k$J$i!"(B
191 $B$=$l$H6&B8$9$kB>$N%U%!%$%k!&%G%#%l%/%H%j$O(B
192 \emph{$B:n6HNN0h%G%#%l%/%H%j(B}$B$K$"$k$b$N!"$H8F$P$l$^$9!#(B
193 $BN><T$N6hJ,$r4JC1$K8@$&$J$i!"(B
194 \emph{$B%j%]%8%H%j(B}$B$,%W%m%8%'%/%H$N(B\emph{$BMzNr(B}$B$rJ];}$9$k0lJ}$G!"(B
195 \emph{$B:n6HNN0h%G%#%l%/%H%j(B}$B$O!"(B
196 $BMzNr>e$N$H$"$k;~E@$K$*$1$k%W%m%8%'%/%H$N(B\emph{$B%9%J%C%W%7%g%C%H(B}$B$rJ];}$9$k!"(B
197 $B$H8@$($^$9!#(B
199 \section{A tour through history}
201 $BFk@w$_$NL5$$?7$7$$%j%]%8%H%j$KBP$7$F$O!"(B
202 $B$^$:$O$=$NMzNr$r;2>H$7$F$_$h$&$H;W$&$3$H$G$7$g$&!#(B
203 \hgcmd{log} $B%3%^%s%I$O!"MzNr>pJs$r=PNO$7$^$9!#(B
205 \interaction{tour.log}
207 $B$3$N%3%^%s%I$N4pDlF0:n$G$O!"(B
208 $B%W%m%8%'%/%H$K2C$($i$l$?8D!9$NJQ99$N5-O?$KBP$7$F4JC1$J=PNO$r9T$$$^$9!#(B
209 Mercurial $B$NMQ8l$G$O!"(B
210 $BJ#?t$N%U%!%$%k$KBP$9$kJQ99$rJ];}$7F@$k$3$H$+$i!"(B
211 $B5-O?$5$l$?$3$l$i$N=PMh;v$r(B\emph{$B%A%'%s%8%;%C%H(B}$B$H8F>N$7$^$9!#(B
213 \hgcmd{log} $B$N=PNO7A<0$K$*$1$k3FMs$O!"(B
214 $B0J2<$N$h$&$K$J$C$F$$$^$9!#(B
216 \begin{description}
217 \item[\texttt{changeset}] $B$3$NMs$O!"(B10 $B?J?t!"%3%m%s!J(Bcolon: \texttt{:}$B!K(B
218 $B$*$h$S(B 16 $B?J?t$NO"B37A<0$H$J$C$F$$$^$9!#(B
219 $B#2$D$N?tCM$O6&$K%A%'%s%8%;%C%H$N(B\emph{$B<1JL;R(B}$B$G$9!#(B
220 16 $B?J?t$N$b$N$h$j$b!"(B10 $B?J?t$NJ}$,C;$/!"F~NO$,MF0W$G$"$k$3$H$+$i!"(B
221 $B#2$D$N<1JL;a$,B8:_$7$^$9!#(B
223 \item[\texttt{user}] $B%A%'%s%8%;%C%H$N:n@.<T$K4X$9$k<1JL>pJs$G$9!#(B
224 $B$3$NMs$O<+M37A<0$G$9$,!"KX$I$N>l9g!"(B
225 $B?ML>$HEE;R%a!<%k%"%I%l%9$,3JG<$5$l$^$9!#(B
227 \item[\texttt{date}] $B%A%'%s%8%;%C%H$,:n@.$5$l$?F|;~$H!"$=$N%?%$%`%>!<%s$G$9(B
228 $B!JF|;~$OEv3:%?%$%`%>!<%s$K$*$1$kCM$G$9$N$G!"(B
229 $B%A%'%s%8%;%C%H$N:n@.<T$K$H$C$F$NF|;~$rI=$7$^$9!K!#(B
231 \item[\texttt{summary}] $B%A%'%s%8%;%C%H:n@.<T$,!"(B
232 $B:n@.$N:]$K%A%'%s%8%;%C%H$N@bL@$H$7$FF~NO$7$?%a%C%;!<%8$N:G=i$N9T$G$9!#(B
234 \end{description}
236 $B4pDlF0:n$K$*$1$k(B \hgcmd{log} $B$N=PNO$O!"(B
237 $BC1=c$JMWLs$G$9$N$G!"(B
238 $BB?$/$N>\:Y%G!<%?$,7g$1$F$$$^$9!#(B
240 $B?^(B~\ref{fig:tour-basic:history} $B$O!"(B
241 $BMzNr$N(B``$BF08~(B''$B$rGD0.$70W$/$9$k$?$a$K!"(B
242 \dirname{hello} $B%j%]%8%H%j$K$*$1$kMzNr$r?^<($7$?$b$N$G$9!#(B
243 $BK\>O$*$h$S0J9_$N>O$K$*$$$F!"(B
244 $B2?EY$+$3$N?^$KN)$AJV$k$3$H$K$J$k$3$H$G$7$g$&!#(B
246 \begin{figure}[ht]
247 \centering
248 \grafix{tour-history}
249 \label{fig:tour-basic:history}
250 \caption{Graphical history of the \dirname{hello} repository}
251 \end{figure}
253 \subsection{Changesets, revisions, and talking to other people}
255 $B1Q8l$,IT@53N$5$G0-L>9b$$8@8l$G$"$j!"(B
256 $B7W;;5!2J3X$G$OMQ8l$N:.Mp$O$$$D$b$N$3$H$G$9$N$G!"(B
257 $B9=@.4IM}$NJ,Ln$G$O!"(B
258 $BF1$8$3$H$rI=$9J#?t$NMQ8l$d8@$$2s$7$,B8:_$7$^$9!#(B
259 Mercurial $B$G$NMzNr4IM}$K$D$$$FOC$r$9$k>l9g!"(B
260 ``$B%A%'%s%8%;%C%H(B''$B!J(Bchangeset$B!K$H$$$&MQ8l$,;~$K$O(B
261 ``$B%A%'%s%8(B''$B!J(Bchange$B!K$d(B
262 $B!JJ8=q$N>l9g$O!K(B``cset''$B$J$I$H>JN,$5$l$F$$$?$j!"(B
263 $B%A%'%s%8%;%C%H$H$$$&8@$$2s$7$,!"(B
264 ``$B%j%S%8%g%s(B''$B!J(Brevision$B!K$J$$$7(B``rev''
265 $B$rI=$9$b$N$H$7$F;HMQ$5$l$?$j$9$k$N$rL\$K$9$k$+$b$7$l$^$;$s!#(B
267 ``$B%A%'%s%8%;%C%H(B''$B$N35G0$r$I$N$h$&$J(B\emph{$BMQ8l(B}$B$GI=$=$&$,LdBj$G$O$"$j$^$;$s$,!"(B
268 ``\emph{$BFCDj$N(B}$B%A%'%s%8%;%C%H(B''$B$r;X$9$?$a$N(B\emph{$B<1JL;R(B}$B$OHs>o$K=EMW$G$9!#(B
269 \hgcmd{log} $B$N=PNO$K$*$1$k(B \texttt{changeset} $BMs$,!"(B
270 10 $B?J?t$H(B 16 $B?J?t$NN>J}$N<1JL;R$r;H$C$F%A%'%s%8%;%C%H$r<1JL$7$F$$$k!"(B
271 $B$H$$$&$3$H$r;W$$=P$7$F$/$@$5$$!#(B
273 \begin{itemize}
274 \item 10 $B?J?t$N<1JL;R!J!a(B $B%j%S%8%g%sHV9f!K$,!"(B
275 \emph{$BEv3:%j%]%8%H%j$G$N$_M-8z$JCM(B}$B$G$"$k0lJ}$G!"(B
277 \item 16 $B?J?t$N<1JL;R$O!"(B\emph{$BA4$F$N(B}$BJ#@=%j%]%8%H%j$KEO$C$F!"(B
278 $B87L)$K%A%'%s%8%;%C%H$r<1JL2DG=$J(B\emph{$B915WIaJW$N<1JL;R(B}$B$G$9!#(B
280 \end{itemize}
282 $B$3$N6hJL$O=EMW$G$9!#(B
283 $BEE;R%a!<%k$GB>$N?M$H(B``$B%j%S%8%g%s(B~33''$B$NOC$r$7$?>l9g!"(B
284 $BAj<j$N%j%S%8%g%s(B~33$B$O!"(B
285 $B<+J,$N0U?^$9$k$=$l$H$O9b$$3NN($G(B\emph{$B0[$J$j$^$9(B}$B!#(B
286 $B$3$l$O!"(B
287 $B%j%S%8%g%sHV9f$N3d$jIU$1$,!"(B
288 $BEv3:%A%'%s%8%;%C%H$,%j%]%8%H%j$KG'<1$5$l$?=g=x$K0MB8$7$F$*$j!"(B
289 $B%A%'%s%8%;%C%H$NG'<1=g=x$,F10l$G$"$k$3$H$r!"(B
290 $B0[$J$k%j%]%8%H%j$N4V$G$OJ]>c$G$-$J$$$?$a$G$9!#(B
291 $B#3$D$N%A%'%s%8%;%C%H(B $a,b,c$ $B$,!"(B
292 $B$H$"$k%j%]%8%H%j$G$O(B $0,1,2$ $B$N=g=x$GG'<1$5$l$k0lJ}$G!"(B
293 $BJL$J%j%]%8%H%j$G$O(B $1,0,2$ $B$N=g=x$GG'<1$5$l$k!"(B
294 $B$H$$$C$?$3$H$OMF0W$K5/$3$jF@$^$9!#(B
296 Mercurial $B$,%j%S%8%g%sHV9f$r;HMQ$7$F$$$k$N$O!"(B
297 $B=c?h$K5-=R4JN,2=$NMxJX@-$N$?$a$G$9!#(B
298 $BB>$N?M$H%A%'%s%8%;%C%H$K4X$7$FOC$r$9$k>l9g$d!"(B
299 $B2?$i$+$NM}M3!JNc$($P!">c32Js9p$K$*$1$k5-O?!K(B
300 $B$K$h$C$F%A%'%s%8%;%C%H$K4X$9$k5-O?$r;D$9>l9g$O!"(B
301 16 $B?J?t$N<1JL;R$r;H$$$^$7$g$&!#(B
303 \subsection{Viewing specific revisions}
305 \hgcmd{log} $B$N=PNO$rC10l$N%j%S%8%g%s$N$b$N$K8BDj$9$k>l9g!"(B
306 \hgopt{log}{-r}$B!J$J$$$7(B \hgopt{log}{--rev}$B!K%*%W%7%g%s$r;HMQ$7$^$9!#(B
307 10 $B?J?t$N%j%S%8%g%sHV9f$H!"(B
308 16 $B?J?t$N%A%'%s%8%;%C%H<1JL;R$N$I$A$i$b;HMQ$G$-$^$9$7!"(B
309 $BI,MW$K1~$8$FJ#?t$N%j%S%8%g%s$r;XDj$9$k$3$H$b$G$-$^$9!#(B
311 \interaction{tour.log-r}
313 $B8DJL$KNs5s$9$k$3$HL5$7$KJ#?t$N%j%S%8%g%s$NMzNr$r;2>H$7$?$$>l9g$O!"(B
314 \emph{$BHO0O5-K!(B}$B$r;HMQ$7$^$9!#(B
315 $B$3$N5-K!$O!"(B
316 ``$a$ $B$+$i(B $b$ $B$N4V$NA4$F$N%j%S%8%g%s(B''
317 $B$H$$$&0U?^$rI=8=$7$^$9!#(B
319 \interaction{tour.log.range}
321 Mercurial $B$O$j%S%8%g%s$N5-=R=g=x$KCi<B$K?6Iq$$$^$9$N$G!"(B
322 \hgcmdargs{log}{-r 2:4} $B$H$$$&%3%^%s%I5/F0$,(B
323 $2,3,4$ $B$N=g=x$GI=<($9$k0lJ}!"(B
324 \hgcmdargs{log}{-r 4:2} $B$H$$$&%3%^%s%I5/F0$O(B
325 $4,3,2$ $B$N=g=x$GI=<($7$^$9!#(B
327 \subsection{More detailed information}
329 $BL\Ev$F$N%A%'%s%8%;%C%H$,4{$KH=L@$7$F$$$k>l9g$O(B
330 \hgcmd{log} $B$,=PNO$9$k35MW>pJs$OM-MQ$G$9$,!"(B
331 $B$"$k%A%'%s%8%;%C%H$,L\Ev$F$N$b$N$+H]$+$rH=Dj$7$h$&$H$9$k>l9g$K$O!"(B
332 $BJQ99$K$D$$$F$N40A4$J@bL@J8$d!"(B
333 $BJQ99$5$l$?%U%!%$%k$N0lMw$,I,MW$K$J$k$3$H$G$7$g$&!#(B
334 \hgcmd{log} $B%3%^%s%I$N(B
335 \hggopt{-v}$B!J$J$$$7(B \hggopt{--verbose}$B!K%*%W%7%g%s$O!"(B
336 $B$3$l$iDI2C$N>\:Y>pJs$rI=<($7$^$9!#(B
338 \interaction{tour.log-v}
340 $B@bL@J8$HJQ99FbMF$NN>J}$r8+$?$$>l9g$O!"(B
341 \hgopt{log}{-p} $B!J$J$$$7(B \hgopt{log}{--patch}$B!K(B
342 $B%*%W%7%g%s$rIU2C$7$F$/$@$5$$!#(B
343 $B$3$N%*%W%7%g%s$K$h$j!"(B
344 $BJQ99FbMF$,(B \emph{unified diff} $B7A<0(B
345 $B!J$3$l$^$G$K(B unified diff $B7A<0$r8+$?$3$H$,L5$$$N$G$7$?$i!"(B
346 \ref{sec:mq:patch}~$B@a$K35MW$N@bL@$,$"$j$^$9!K$G=PNO$5$l$^$9!#(B
348 \interaction{tour.log-vp}
350 \section{All about command options}
352 Mercurial $B$N%3%^%s%IC58!$r$3$3$G>/!9CfCG$7$F!"(B
353 Mercurial $B%3%^%s%I$NF0:n%Q%?!<%s$K$D$$$F@bL@$7$^$7$g$&!#(B
354 $BK\>O$K$*$1$k%D%"!<$rB3$1$k$K$D$l$F!"(B
355 $B$3$N$3$H$r3P$($F$*$$$FNI$+$C$?$H;W$&$3$H$G$7$g$&!#(B
357 Mercurial $B$O!"(B
358 $B%3%^%s%I$KBP$7$F;XDj2DG=$J%*%W%7%g%s$N<h$j07$$$K4X$7$F!"(B
359 $B6aG/$N(B Linux $B$*$h$S(B Unix $B%7%9%F%`$K6&DL$N%*%W%7%g%s5-=R47=,$rF'=1$7$?!"(B
360 $B0l4S$7$?AGD>$J07$$J}$r:NMQ$7$F$$$^$9!#(B
362 \begin{itemize}
363 \item $BA4$F$N%*%W%7%g%s$O%m%s%0%M!<%`!J(Blong name$B!K$r;}$C$F$$$^$9!#(B
364 $BNc$($P!"4{$K8+$F$-$?$h$&$K!"(B
365 \hgcmd{log} $B%3%^%s%I$O(B \hgopt{log}{--rev} $B%*%W%7%g%s$r<u$1IU$1$^$9!#(B
367 \item $BKX$I$N%*%W%7%g%s$,%7%g!<%H%M!<%`!J(Bshort name$B!K$b;}$C$F$$$^$9!#(B
368 \hgopt{log}{--rev} $B%*%W%7%g%s$NBe$o$j$K(B
369 \hgopt{log}{-r} $B$r;HMQ$G$-$^$9(B
370 $B!J%7%g!<%H%M!<%`$r;}$?$J$$%*%W%7%g%s$,$"$k$N$O!"(B
371 $B$=$l$i$N%*%W%7%g%s$,LGB?$KMxMQ$5$l$J$$$?$a$G$9(B\footnote{$BLuCm(B:
372 $BLu<T$N%3%^%s%I3+H/7P83$G$O!"(B
373 $B%7%g!<%H%M!<%`$N8uJd$H$J$k%"%k%U%!%Y%C%H$,J#?t$N%*%W%7%g%s$N4V$G=E$J$k>l9g!"(B
374 $B$"$($F%7%g!<%H%M!<%`$r@_Dj$7$J$$!"(B
375 $B$H$$$&>l9g$b$"$j$^$9!#(B}$B!K!#(B
377 \item $B%m%s%0%M!<%`%*%W%7%g%s$O#2$D$N%^%$%J%95-9f(B\footnote{$BLuCm(B:
378 $B86J8$G$O(B ``dash(es)'' $B$G$9$,!"(B
379 $B!V%@%C%7%e!J%@!<%7!K!W$d!V%O%$%U%s!W$h$j$b!"(B
380 PC $B$K$*$1$kF~NO$G$OD>@\E*$J!"(B
381 $B!V%^%$%J%95-9f!W$rLu8l$KEv$F$^$7$?!#(B}$B$G;O$^$j$^$9(B
382 $B!JNc(B: \hgopt{log}{--rev}$B!K$,(B
383 $B%7%g!<%H%M!<%`%*%W%7%g%s$O#1$D$N%^%$%J%95-9f$G;O$^$j$^$9(B
384 $B!JNc(B: \hgopt{log}{-r}$B!K!#(B
386 \item $B%*%W%7%g%s$NL?L>$HMQK!$O!"%3%^%s%I4V$G0l4S@-$,<h$i$l$F$$$^$9(B\footnote{
387 $BLuCm!'(B $BLu<T$,0JA0!"%*%W%7%g%s$rDI2C$9$k%Q%C%A$rDs0F$7$?:]$K$O!"(B
388 $B%Q%C%A$N5!G=E*$JOC$H$OJL$K!"(B
389 $B!V!{!{$N%3%^%s%I$G$O!_!_$H$$$&$&L?L>$K$J$C$F$$$k$+$i!"$=$l$KJo$C$F$M!W(B
390 $B$H;XE&$5$l$?$3$H$,$"$j!"(B
391 $B!V0l4S@-$,$H$i$l$F$$$k!W$H$N<gD%$O0KC#$G$O$"$j$^$;$s!#(B}$B!#(B
392 $BNc$($P!"%A%'%s%8%;%C%H<1JL;R$d$j%S%8%g%sHV9f$r;XDj2DG=$J%3%^%s%I$O!"(B
393 $BA4$F(B \hgopt{log}{-r} $B$*$h$S(B \hgopt{log}{--rev} $B%*%W%7%g%s$r<uM}$7$^$9!#(B
395 \end{itemize}
397 $BK\=q$N<B9TNc$G$O!"(B
398 $B%m%s%0%M!<%`%*%W%7%g%s$NBe$o$j$K%7%g!<%H%M!<%`%*%W%7%g%s$r;HMQ$7$^$9!#(B
399 $B$3$l$OC1$KI.<T$N9%$_$H$$$&$@$1$N$3$H$G$9$N$G!"(B
400 $BFC$K5$$K$9$kI,MW$O$"$j$^$;$s!#(B
402 $B2?$i$+$NI=<($r9T$&%3%^%s%I$NB?$/$O!"(B
403 \hggopt{-v}$B!J$J$$$7(B \hggopt{--verbose}$B!K(B
404 $B%*%W%7%g%s$rIUM?$9$k$3$H$G$h$jB?$/$N>pJs$NI=<($r!"(B
405 \hggopt{-q}$B!J$J$$$7(B \hggopt{--quiet}$B!K(B
406 $B%*%W%7%g%s$rIUM?$9$k$3$H$GI=<($rM^;_$9$k$3$H$,$G$-$^$9!#(B
408 \section{Making and reviewing changes}
410 $B$3$N;~E@$G!"(BMercurial $B$K$*$1$kMzNr$rGD0.$G$-$F$$$^$9$N$G!"(B
411 $BJQ99$N<B;\$d!"$=$N8!>Z$r9T$C$F$_$^$7$g$&!#(B
413 $B$^$:;O$a$K$9$Y$-$3$H$O!"(B
414 $BFH<+$N<B83$r85!9$N%j%]%8%H%j$+$i3VN%$9$k$3$H$G$9!#(B
415 $B%j%]%8%H%j$NJ#@=$K!"@hDx$O(B \hgcmd{clone} $B$r;HMQ$7$^$7$?$,!"(B
416 $B$3$N;~E@$G$N1s3V%j%]%8%H%j$+$i$NJ#@=$OI,MW$"$j$^$;$s!#(B
417 $B4{$K<j85$K$"$kJ#@=%j%]%8%H%j$+$iJ#@=$9$l$PNI$$$N$G$9!#(B
418 $B%m!<%+%k%j%]%8%H%j$NJ#@=$O!"(B
419 $B%M%C%H%o!<%/1[$7$NJ#@=$h$j$bHs>o$K9bB.$G$9$7!"(B
420 $BB?$/$N>l9g$K$*$$$F%G%#%9%/NN0h>CHq$b>/$J$/$F:Q$_$^$9(B\footnote{$BLuCm(B:
421 $B>\:Y$O(B ``Avoiding seeks'' $B$K$"$j$^$9$,!"(B
422 Mercurial $B$O%m!<%+%k%j%]%8%H%j$NJ#@=$N:]$K!"(B
423 $B%G%#%9%/%X%C%I$N%7!<%/2sHr$N$?$a$K!"(B
424 $B%U%!%$%k$NJ#@=$G$O$J$/=j0b(B``$B%O!<%I%j%s%/(B''$B$r<B;\$7$^$9!#(B}$B!#(B
426 \interaction{tour.reclone}
428 $BOC$O0o$l$^$9$,!"(B
429 $B:n6H$KCe<j$7$h$&$H$7$?:]$K!"(B
430 $B:n6HMQ%5%s%I%\%C%/%9$H$7$F$N0l;~E*$JJ#@=$r2?;~$G$b:n@.$G$-$^$9$N$G!"(B
431 $B1s3V%j%]%8%H%j$NJ#@=$r(B``$B$^$C$5$i$J(B''$B>uBV$GJ]$D$h$&$K?43]$1$k$N$,NI$$$G$7$g!#(B
432 $B$3$&$9$k$3$H$G!"(B
433 $BJ#?t$N:n6H$rJ?9T$K9T$&$3$H$,$G$-$^$9$7!"(B
434 $B:n6H40N;8e$K$=$l$i$rE}9g$9$k$^$G$O!"(B
435 $B8_$$$N:n6H$r3VN%$5$l$?>uBV$K$9$k$3$H$,$G$-$^$9!#(B
436 $B%m!<%+%k%j%]%8%H%j$NJ#@=$ODc%3%9%H$G$9$+$i!"(B
437 $B%j%]%8%H%j$NJ#@=$*$h$SGK4~$K$O%*!<%P%X%C%I$,KX$I$"$j$^$;$s!#(B
439 \dirname{my-hello} $B%j%]%8%H%j$K$O!"(B
440 $BE57?E*$J(B ``hello, world'' $B%W%m%0%i%`$,3JG<$5$l$?(B
441 \filename{hello.c} $B%U%!%$%k$,$"$j$^$9!#(B
442 $B$G$O$3$3$G!"(B
443 $B$$$K$7$($N(B \command{sed} $B%3%^%s%I$r;HMQ$7$F!"(B
444 $B#29TL\$r=PNO$9$k$h$&$KJQ99$7$F$_$^$7$g$&!#(B
445 $B!JJQ99$N$?$a$K(B \command{sed} $B$r;HMQ$9$k$N$O!"(B
446 $BC1$K%9%/%j%W%H$K$h$k<+F02=$,4JC1$G$"$k$+$i$G$9!#(B
447 $B<+F02=$NI,MW$,L5$1$l$P!"(B
448 $B$*$=$i$/(B \command{sed} $B$r;HMQ$9$kI,MW$OL5$$$G$7$g$&!#(B
449 $B9%$_$N%(%G%#%?$GJT=8$r$7$F$/$@$5$$!#!K!#(B
451 \interaction{tour.sed}
453 \hgcmd{status} $B%3%^%s%I$K$h$j!"(B
454 $B%j%]%8%H%jG[2<$N%U%!%$%k$N>u67$K4X$9$k(B
455 Mercurial $B$NG'<1$,I=<($5$l$^$9!#(B
457 \interaction{tour.status}
459 $B4v$D$+$N%U%!%$%k$KBP$7$F$O!"(B
460 \hgcmd{status} $B%3%^%s%I$OFC$K2?$bI=<($7$^$;$s$,!"(B
461 \filename{hello.c} $B$KBP$7$F$O(B
462 ``\texttt{M}'' $B$G;O$^$k9T$rI=<($7$^$9!#(B
463 $BL@<(E*$K;XDj$7$J$$8B$j!"(B
464 $BJQ99$5$l$F$$$J$$%U%!%$%k$KBP$7$F(B
465 \hgcmd{status} $B$O2?$bI=<($7$^$;$s!#(B
467 ``\texttt{M}'' $BI=<($O!"(B
468 Mercurial $B$,(B \filename{hello.c} $B%U%!%$%k$NJQ99$r8!CN$7$F$$$k$3$H$rI=$7$^$9!#(B
469 $B%U%!%$%k$NJQ99$K@hN)$C$F!J$"$k$$$OJQ99$N8e$K!K!"(B
470 Mercurial $B$KBP$7$F(B\emph{$BDLCN(B}$B$9$kI,MW$O$"$j$^$;$s!#(B
471 Mercurial $B<+?H$GJQ99$N<B;\$r8!CN$9$k$3$H$,$G$-$^$9!#(B
473 \hgcmd{status} $B$NI=<($O!"(B
474 \filename{hello.c} $B$rJQ99$7$?$3$H$rCN$k$N$KLrN)$A$^$9$,!"(B
475 \emph{$B$I$N$h$&$J(B}$BJQ99$r9T$C$?$N$+$r87L)$KCN$j$?$$>l9g$bM-$k$G$7$g$&!#(B
476 $BJQ99FbMF$rCN$k$?$a$K$O!"(B
477 \hgcmd{diff} $B%3%^%s%I$r;HMQ$7$^$9!#(B
479 \interaction{tour.diff}
481 \section{Recording changes in a new changeset}
483 $BJQ99FbMF$KK~B-$7$F!"(B
484 $B?75,%A%'%s%8%;%C%H$KJQ99FbMF$r5-O?$9$k$KB-$k>u67$KE~C#$9$k$^$G$O!"(B
485 $B%U%!%$%k$NFbMF$rJQ99$7!"(B
486 $B%S%k%I$HJQ99FbMF$KBP$9$k;n83$r9T$$!"(B
487 \hgcmd{status} $B$*$h$S(B \hgcmd{diff} $B$K$h$kJQ99FbMF$r3NG'$9$k!"(B
488 $B$H$$$&:n6H$r7+$jJV$7$^$9!#(B
490 \hgcmd{commit} $B%3%^%s%I$rMQ$$$k$3$H$G!"(B
491 $B%A%'%s%8%;%C%H$r?7$?$K:n@.$9$k$3$H$,$G$-$^$9!#(B
492 $BDL>o$3$l$r(B``$B%3%_%C%H$N<B;\(B''$B!J(B``making a commit''$B!K$J$$$7(B
493 ``$B%3%_%C%H$9$k(B''$B!J(B``committing''$B!K$H8@$$$^$9!#(B
495 \subsection{Setting up a username}
497 $B:G=i$K(B \hgcmd{commit} $B<B9T$r9T$&:]$K$O!"(B
498 $BI,$:$7$b<B9T$,@.8y(B\footnote{$BLuCm(B:
499 $B$3$3$G8@$&(B``$B@.8y(B''$B$H$O!"(B
500 $B%3%^%s%I<B9T$=$N$b$N$N@.8y$H$$$&$h$j$O!"(B
501 ``$B;W$C$?DL$j$N%A%'%s%8%;%C%H$r@8@.(B''$B$9$k$3$H$KBP$9$k@.8y$K6a$$%K%e%"%s%9$G$9!#(B
502 }$B$9$k$H$O8B$j$^$;$s!#(B
503 $B%A%'%s%8%;%C%H$N%3%_%C%H$N:]$K(B Mercurial $B$O!"(B
504 $B%3%_%C%H$7$?%f!<%6$NL>A0$HEE;R%a!<%k%"%I%l%9$r!"(B
505 $B%A%'%s%8%;%C%HKh$K5-O?$7$^$9$N$G!"(B
506 $BC/$b$,8e$+$i%A%'%s%8%;%C%H:n@.<T$rCN$k$3$H$,$G$-$^$9!#(B
507 Mercurial $B$O0J2<$N<j=g$G!"(B
508 $BJQ99FbMF$H6&$K5-O?$9$kBEEv$J%f!<%6L>$r<+F0E*$K8!=P$7$h$&$H$7$^$9!#(B
510 \begin{enumerate}
511 \item \hgcmd{commit} $B%3%^%s%I5/F0$N:]$K(B
512 \hgopt{commit}{-u} $B%*%W%7%g%s$K$h$C$F%f!<%6L>$r;XDj$7$?>l9g!"(B
513 $B>o$K$=$NCM$,M%@hE*$K;HMQ$5$l$^$9!#(B
515 \item $B<!$K(B \envar{HGUSER} $B4D6-JQ?t@_Dj$NM-L5$,3NG'$5$l$^$9!#(B
517 \item $B%[!<%`%G%#%l%/%H%jD>2<$K!"(B
518 \rcitem{ui}{username} $BMWAG$r;}$D(B
519 \sfilename{.hgrc}\footnote{$BLuCm(B:
520 Windows $B8~$1%P%$%J%jHG$N>l9g!"(B
521 \envar{HOME} $B4D6-JQ?t$,;X$9%G%#%l%/%H%j!"(B
522 $B$J$$$7(B \dirname{C:\\Documents and Settings\\USERNAME}
523 $BG[2<$N(B \sfilename{Mercurial.ini} $B$,MQ$$$i$l$^$9!#(B}
524 $B$,$"$k>l9g!"$=$NCM$,;HMQ$5$l$^$9!#(B
525 $B$3$N%U%!%$%k$K=q$/$Y$-FbMF$K4X$7$F$O!"(B
526 \ref{sec:tour-basic:username}$B@a$r;2>H$7$F$/$@$5$$!#(B
528 \item \envar{EMAIL} $B4D6-JQ?t$,@_Dj$5$l$F$$$k>l9g$O!"(B
529 $B$=$NCM$,;HMQ$5$l$^$9!#(B
531 \item $B$=$l0J30$N>l9g!"(B
532 Mercurial $B$O2TF0$7$F$$$k%7%9%F%`$K%f!<%6$H%[%9%H$NL>A0$rLd$$9g$o$;$?>e$G!"(B
533 $BEE;R%a!<%k%"%I%l%97A<0$N%f!<%6L>$r@8@.$7!"$3$l$r;HMQ$7$^$9!#(B
534 $B$3$NJ}K!$G@8@.$5$l$?%f!<%6L>$O1}!9$K$7$FLr$KN)$?$J$$$?$a!"(B
535 Mercurial $B$O7Y9p$rI=<($7$^$9!#(B
537 \end{enumerate}
539 $B>e5-$NJ}K!$,A4$F<:GT$7$?>l9g!"(B
540 Mercurial $B$K$h$k%3%_%C%H$O<:GT$7!"(B
541 $B%(%i!<%a%C%;!<%8$rI=<($7$^$9!#(B
542 $B$=$N$h$&$J>l9g$G$O!"L@<(E*$K%f!<%6L>$r;XDj$7$J$$8B$j!"(B
543 $B%3%_%C%H$O@.8y$7$J$$$G$7$g$&!#(B
545 \envar{HGUSER} $B4D6-JQ?t$H(B
546 \hgcmd{commit} $B%3%^%s%I$X$N(B
547 \hgopt{commit}{-u} $B%*%W%7%g%s;XDj$O!"(B
548 Mercurial $B@_Dj%U%!%$%kCf$N(B username $B@_Dj$r(B
549 \emph{$BL58z$K$9$k(B}$BE@$KCm0U$7$F$/$@$5$$!#(B
550 $BDL>o$N;HMQ$K$*$$$F!"(B
551 $B<+?H$N%f!<%6L>$r4JC13n$D3N<B$K;XDj$9$k$K$O!"(B
552 \sfilename{.hgrc} $B%U%!%$%k$G;XDj$9$k$N$,NI$$$G$7$g!#(B
553 $B5-=RJ}K!$K4X$9$k>\:Y$O8e=R$7$^$9!#(B
555 \subsubsection{Creating a Mercurial configuration file}
556 \label{sec:tour-basic:username}
558 $B%f!<%6L>$r@_Dj$9$k$K$O!"(B
559 $B$^$:$O9%$_$N%(%G%#%?$r;H$C$F!"(B
560 $B%[!<%`%G%#%l%/%H%jD>2<$K(B
561 \sfilename{.hgrc}$B%U%!%$%k$r:n@.$7$^$9!#(B
562 Mercurial $B$O$3$N%U%!%$%k$+$iMxMQ<T$N8D?M@_Dj$r;2>H$7$^$9!#(B
563 \sfilename{.hgrc} $B$NFbMF$O!"(B
564 $B$^$:$O0J2<$N$h$&$K$J$k$G$7$g$&!#(B
566 \begin{codesample2}
567 # This is a Mercurial configuration file.
568 [ui]
569 username = Firstname Lastname <email.address@domain.net>
570 \end{codesample2}
572 ``\texttt{[ui]}'' $B9T$O!"(B
573 $B@_Dj%U%!%$%k$N(B\emph{$B%;%/%7%g%s(B}$B3+;O$r0UL#$7!"(B
574 ``\texttt{username = ...}'' $B$H$$$&5-=R9T$O(B
575 ``\texttt{ui} $B%;%/%7%g%s$K$*$1$k(B \texttt{username} $B9`L\$X$NCM$N@_Dj(B''
576 $B$H$_$J$5$l$^$9!#(B
577 $B0lEY%;%/%7%g%s$,3+;O$5$l$?$J$i!"(B
578 $B?7$?$J%;%/%7%g%s$,3+;O$5$l$k$+!"(B
579 $B%U%!%$%k$NKvHx$KC#$9$k$^$GEv3:%;%/%7%g%s$,B3$-$^$9!#(B
580 $B6u$N9T$H!"(B
581 ``\texttt{\#}'' $B$N<!$NJ8;z$+$i9TKv$^$G$O!"(B
582 Mercurial $B$K$h$C$F%3%a%s%H$H$_$J$5$lL5;k$5$l$^$9!#(B
584 \subsubsection{Choosing a user name}
586 \texttt{username} $B@_Dj9`L\$O!"(B
587 Mercurial $B$KM?$($kCM$G$O$"$j$^$9$,!"(B
588 $B%j%]%8%H%j$r;2>H$9$kB>$NMxMQ<T$N$?$a$N>pJs$G$9$N$G!"(B
589 $BG$0U$NJ8;z$r;HMQ2DG=$G$9!#(B
590 $BKX$I$NMxMQ<T$O!"(B
591 $BL>A0$HEE;R%a!<%k%"%I%l%9$rMQ$$$?A0=R$N$h$&$J7A<0$rMQ$$$F$$$^$9!#(B
593 \begin{note}
594 Mercurial $B$NAH$_9~$_%&%'%V%5!<%P5!G=$G$O!"(B
595 $B%9%Q%`%a!<%k$NAwIU<T$,MxMQ$9$kEE;R%a!<%k%"%I%l%9<+F0<}=8%D!<%k$KBP$7$F!"(B
596 $BEE;R%a!<%k%"%I%l%9$rFqFI2=$9$k$3$H$,2DG=$G$9!#(B
597 $B$3$N5!G=$rMQ$$$k$3$H$G!"(B
598 Mercurial $B%j%]%8%H%j$r%&%'%V>e$K8x3+$7$?:]$K!"(B
599 $B1WBN$bL5$$%a!<%k<u?.$NA}2C$rM^;_$9$k$3$H$,$G$-$^$9!#(B
600 \end{note}
602 \subsection{Writing a commit message}
604 $BEv3:%A%'%s%8%;%C%H$G$NJQ99FbMF$r@bL@$9$k%a%C%;!<%8$rF~NO$9$k$?$a$K!"(B
605 Mercurial $B$O%3%_%C%H$N:]$K%(%G%#%?$r5/F0$7$^$9!#(B
606 $B$3$N%a%C%;!<%8$r(B\emph{$B%3%_%C%H%a%C%;!<%8(B}$B$H8F$S!"(B
607 $BFI$_<j$KJQ99$NFbMF$HM}M3$rEA$($k$?$a$K5-O?$5$l$k$b$N$G!"(B
608 $B%3%_%C%H8e$N(B \hgcmd{log} $B%3%^%s%I$K$h$jI=<($5$l$^$9!#(B
610 \interaction{tour.commit}
612 \hgcmd{commit} $B%3%^%s%I$,5/F0$9$k%(%G%#%?$O!"(B
613 ``\texttt{HG:}''$B$G;O$^$k?t9T$,8e$KB3$/6u9T$rI=<($7$F$$$k$3$H$G$7$g$&!#(B
615 \begin{codesample2}
616 \emph{$B6u9T(B}
617 HG: changed hello.c
618 \end{codesample2}
620 Mercurial $B$O(B
621 ``\texttt{HG:}'' $B$G;O$^$k9T$rL5;k$7$^$9!#(B
622 $B$3$l$i$N9T$O!"(B
623 $B%A%'%s%8%;%C%H$X$NJQ995-O?BP>]$H$J$k%U%!%$%k$N0lMw$r!"(B
624 $B%3%_%C%H$7$h$&$H$7$F$$$k%f!<%6$KCN$i$;$k$?$a$@$1$N$b$N$G$9!#(B
625 $B$=$N$?$a!"$3$l$i$N9T$NJQ99$d:o=|$O2?$b0UL#$r;}$A$^$;$s!#(B
627 \subsection{Writing a good commit message}
629 \hgcmd{log} $B$O%3%_%C%H%a%C%;!<%8$N:G=i$N#19T$7$+I=<($7$^$;$s$N$G!"(B
630 $B:G=i$N#19T$@$1$G0UL#$NDL$8$kFbMF$K$9$k$N$,NI$$$G$7$g$&!#(B
631 $B$3$NJ}?K$+$i(B\emph{$B30$l$F$$$k(B}$B$?$a$K!"(B
632 $BFI$_Fq$$%3%_%C%H%a%C%;!<%8$N<BNc$r0J2<$K<($7$^$9!#(B
634 \begin{codesample2}
635 changeset: 73:584af0e231be
636 user: Censored Person <censored.person@example.org>
637 date: Tue Sep 26 21:37:07 2006 -0700
638 summary: include buildmeister/commondefs. Add an exports and install
639 \end{codesample2}
641 $B%3%_%C%H%a%C%;!<%8$N#29TL\0J9_$K4X$7$F$O!"(B
642 $BFC$K87L)$J%k!<%k$OB8:_$7$^$;$s!#(B
643 $B%3%_%C%H%a%C%;!<%8$KBP$7$F!"(B
644 $B%W%m%8%'%/%H1?MQ>e$NJ}?K$H$7$F2?$i$+$N7A<0$rMW5a$9$k$+$b$7$l$^$;$s$,!"(B
645 Mercurial $B<+?H$,2r<a$dWVEY$r$9$k$3$H$O$"$j$^$;$s!#(B
647 $BI.<T$N8D?ME*$J9%$_$O!"(B
648 \hgcmdargs{log}{--patch} $B$r0lJM$7$?$@$1$G$OH=CG$G$-$J$$;vJA$K$D$$$F!"(B
649 $B4J7i$G$"$j$J$,$iM-1W$J>pJs$r$b$?$i$9$h$&$J%3%_%C%H%a%C%;!<%8$G$9!#(B
651 \subsection{Aborting a commit}
653 $B%3%_%C%H%a%C%;!<%8$N5-=RCf$K%3%_%C%H$r<h$j$d$a$r7h0U$7$?>l9g$K$O!"(B
654 $BJT=8Cf$N%U%!%$%k$rJ]B8$;$:$K%(%G%#%?$r=*N;$9$l$PNI$$$N$G$9!#(B
655 $B$3$N>l9g!"%j%]%8%H%j$H:n6HNN0h%G%#%l%/%H%j$N$$$:$l$KBP$7$F$b!"(B
656 $B2?$iA`:n$O2C$($i$l$^$;$s!#(B
658 $B0z?tL5$7$G(B \hgcmd{commit} $B%3%^%s%I$r<B9T$7$?>l9g!"(B
659 \hgcmd{status} $B$*$h$S(B \hgcmd{diff}
660 $B$K$h$C$FJs9p$5$l$?A4$F$NJQ99FbMF$,5-O?$5$l$^$9!#(B
662 \subsection{Admiring our new handiwork}
664 $B%3%_%C%H$,40N;$7$?$J$i!"(B
665 $B:#$7$,$??75,:n@.$7$?%A%'%s%8%;%C%H$r(B
666 \hgcmd{tip} $B%3%^%s%I$GI=<($9$k$3$H$,$G$-$^$9!#(B
667 $B$3$N%3%^%s%I$O(B \hgcmd{log} $B$HF10l$N=PNO$r9T$$$^$9$,!"(B
668 $BI=<($5$l$k$N$O%j%]%8%H%j$K$*$1$k:G?7$N%j%S%8%g%s$@$1$G$9!#(B
670 \interaction{tour.tip}
672 $B%j%]%8%H%j$K$*$1$k:G?7$N%j%S%8%g%s$r(B tip $B%j%S%8%g%s!"(B
673 $B$"$k$$$OC1$K(B tip $B$H8F$S$^$9!#(B
675 \section{Sharing changes}
677 $B@h$N5-=R$G!"(BMercurial $B$K$*$1$k%j%]%8%H%j$O!"(B
678 $B$=$l<+?H$G407k$7$F$$$k;]=R$Y$^$7$?!#(B
679 $B$3$l$OB($A!"(B
680 $B$?$C$?:#?75,$K:n@.$7$?%A%'%s%8%;%C%H$O!"(B
681 $B<j85$N(B \dirname{my-hello} $B%j%]%8%H%j$K$7$+B8:_$7$J$$$3$H$r0UL#$7$^$9!#(B
682 $B$3$NJQ99FbMF$rB>$N%j%]%8%H%j$X$HEAGE$9$kJ}K!$r!"(B
683 $B=g$K8+$F$f$-$^$7$g$&!#(B
685 \subsection{Pulling changes from another repository}
686 \label{sec:tour:pull}
688 $B$^$:;O$a$K!"(B
689 $B85!9$N(B \dirname{hello} $B%j%]%8%H%j$rJ#@=$7$F!"(B
690 $B$?$C$?:#?75,$K:n@.$7$?JQ99$N%3%_%C%H$5$l$F$$$J$$%j%]%8%H%j$r:n@.$7$^$7$g$&!#(B
691 $B$3$NJ#@=$7$?%j%]%8%H%j$r!"(B
692 \dirname{hello-pull} $B$H8F$S$^$9!#(B
694 \interaction{tour.clone-pull}
696 \hgcmd{pull} $B%3%^%s%I$K$h$j!"(B
697 \dirname{my-hello} $B$+$i(B
698 \dirname{hello-pull} $B$X$HJQ99$r<h$j9~$_$^$9!#(B
699 $B$7$+$7$J$,$i!"L$CN$NJQ99$r0G1@$K%j%]%8%H%j$K<h$j9~$`$N$O!"(B
700 $B$"$^$j$>$C$H$7$^$;$s!#(B
701 Mercurial $B$,Ds6!$9$k(B \hgcmd{incoming} $B%3%^%s%I$O!"(B
702 $B<B:]$KJQ99$r<h$j9~$`;vL5$/!"(B
703 \hgcmd{pull}
704 $B$K$h$C$F%j%]%8%H%j$K<h$j9~$^$l$k(B\emph{$BM=Dj(B}$B$N%A%'%s%8%;%C%H$rI=<($7$^$9!#(B
706 \interaction{tour.incoming}
708 $B!JL^O@!"(B
709 \hgcmd{incoming} $B%3%^%s%I$r<B9T$7$?%j%]%8%H%j$KBP$7$F!"(B
710 \hgcmd{pull} $B$K$h$kJQ99<h$j9~$_$N5!2q$h$j$bA0$K!"(B
711 $B$h$jB?$/$NJQ99$rDI2C$9$k$3$H$O2DG=$G$9$N$G!"(B
712 $B<B:]$NJQ99<h$j9~$_$OM=Dj$H$O0[$J$k2DG=@-$,M-$j$^$9!#!K(B
714 $B%j%]%8%H%j$X$NJQ99$N<h$j9~$_$O!"(B
715 $B$I$N%j%]%8%H%j$+$i<h$j9~$`$+$r;X<($7$D$D!"(B
716 \hgcmd{pull} $B%3%^%s%I$r<B9T$9$k$H$$$&4JC1$J$b$N$G$9!#(B
718 \interaction{tour.pull}
720 $B<B;\A08e$N(B \hgcmd{tip} $B=PNO$+$i8+$F<h$l$k$h$&$K!"(B
721 $B<j85$N%j%]%8%H%j$X$NJQ99FbMF$NH?1G$,@.8y$7$F$$$^$9!#(B
722 $B<h$j9~$s$@JQ99FbMF$r:n6HNN0h%G%#%l%/%H%j$K$*$$$F;2>H$9$k$?$a$K$O!"(B
723 $B$b$&$R$H<j=gI,MW$G$9!#(B
725 \subsection{Updating the working directory}
727 $B%j%]%8%H%j$H:n6HNN0h%G%#%l%/%H%j$N4X78$K$D$$$F!"(B
728 $B$3$l$^$G$OBg;(GD$K$7$+@bL@$7$F$-$^$;$s$G$7$?!#(B
729 \ref{sec:tour:pull}~$B@a$G<B9T$7$?(B
730 \hgcmd{pull} $B%3%^%s%I$O!"(B
731 $B%j%]%8%H%j$X$NJQ99$N<h$j9~$_$r9T$$$^$9$,!"(B
732 $B3NG'$7$F$_$l$P$o$+$k$h$&$K!"(B
733 $B:n6HNN0h$K$O2?$i1F6A$r5Z$\$7$^$;$s!#(B
734 $B$3$l$O!"(B
735 \hgcmd{pull} $B$N!J4pDl$N!K5sF0$,!"(B
736 $B:n6HNN0h$K1F6A$r5Z$\$5$J$$$b$N$G$"$k$?$a$G$9!#(B
737 $B:n6HNN0h$N99?7$K$O!"(B
738 \hgcmd{pull} $B$G$O$J$/(B \hgcmd{update} $B$rMQ$$$^$9!#(B
740 \interaction{tour.update}
742 \hgcmd{pull} $B<B9T;~$K:n6HNN0h$r<+F0E*$K99?7$7$J$$$3$H$O!"(B
743 $B0l8+4q0[$K8+$($k$+$b$7$l$^$;$s$,!"(B
744 $B<B$O$=$l$K$OM}M3$,M-$j$^$9!#(B
745 \hgcmd{update} $B$rMQ$$$k$3$H$G!"(B
746 $B%j%]%8%H%j$K5-O?$5$l$?(B\emph{$BG$0U$NHG(B}$B$N>uBV$X$H!"(B
747 $B:n6HNN0h%G%#%l%/%H%j$NFbMF$r99?7$9$k$3$H$,$G$-$^$9!#(B
748 $B:n6HNN0h%G%#%l%/%H%j$r(B
749 ---$BNc$($P!"%P%0$N860xD4::$J$I$N$?$a$K(B---
750 $B8E$$HG$K$7$F:n6H$7$F$$$?>l9g$J$I$O!"(B
751 \hgcmd{pull} $B<B9T$,:n6HNN0h%G%#%l%/%H%j$r:G?7$NHG$K<+F0E*$K99?7$7$F$7$^$&$N$O!"(B
752 $B$"$^$j$h$m$7$/$J$$$G$7$g$&!#(B
754 $B$7$+$7!"(B\hgcmd{pull} $B!A(B \hgcmd{update} $B$H$$$&N.$l$OHs>o$KIQHK$J:n6H$G$9$+$i!"(B
755 \hgcmd{pull} $B$K(B \hgopt{pull}{-u} $B%*%W%7%g%s$r;XDj$9$k$3$H$G!"(B
756 Mercurial $B$O$3$l$i#2$D$rAH$_9g$o$;$?5!G=$rDs6!$7$^$9!#(B
758 \begin{codesample2}
759 hg pull -u
760 \end{codesample2}
762 \ref{sec:tour:pull}~$B@a$G$N(B
763 \hgopt{pull}{-u} $B%*%W%7%g%s$r;XDj$7$J$$(B
764 \hgcmd{pull} $B<B9T$N=PNO$K$O!"(B
765 $B:n6HNN0h%G%#%l%/%H%j$N99?7$KL@<(E*$J<j=g$,I,MW$G$"$k$3$H$r<($9!"(B
766 $BCm0U4-5/$N%a%C%;!<%8$,I=<($5$l$F$$$k$N$,8+$F<h$l$^$9!#(B
768 \begin{codesample2}
769 (run 'hg update' to get a working copy)
770 \end{codesample2}
772 $B:n6HNN0h%G%#%l%/%H%j$,$I$NHG$NFbMF$K4p$E$$$F$$$k$+$r8+$k$K$O!"(B
773 \hgcmd{parents} $B%3%^%s%I$r;HMQ$7$^$9!#(B
775 \interaction{tour.parents}
777 $B?^(B~\ref{fig:tour-basic:history} $B$G$O!"(B
778 $B8D!9$N%A%'%s%8%;%C%H$r7R$0Lp0u$,IA$+$l$F$$$^$9!#(B
779 $BLp0u$N(B\emph{$B:,85(B}$B$K$"$?$k%A%'%s%8%;%C%H$,?F$r!"(B
780 $B$=$7$FLp0u$N(B\emph{$B@h(B}$B$K$"$?$k%A%'%s%8%;%C%H$,;R$rI=$7$F$$$^$9!#(B
781 $BF1$8$h$&$K!":n6HNN0h%G%#%l%/%H%j$b?F$r;}$C$F$*$j!"(B
782 $B8=;~E@$GJ];}$7$F$$$k:n6HNN0h%G%#%l%/%H%j$NFbMF$O!"(B
783 $B$=$N%A%'%s%8%;%C%H$K4p$E$$$?$b$N$G$9!#(B
785 $B:n6HNN0h%G%#%l%/%H%j$NFbMF$rFCDj$NHG$N$b$N$K$9$k>l9g!"(B
786 \hgcmd{update} $B%3%^%s%I$K%j%S%8%g%sHV9f$J$$$7%A%'%s%8%;%C%H(B~ID$B$r;XDj$7$^$9!#(B
788 \interaction{tour.older}
790 $BL@<(E*$JHG;XDj$r$7$J$+$C$?>l9g!"(B
791 $B>e5-$NNc$K$*$1$k#2$DL\$N(B \hgcmd{update} $B<B9T$G8+$F<h$l$k$h$&$K!"(B
792 \hgcmd{update} $B$O(B tip $B$,;XDj$5$l$?$b$N$H$7$F?6Iq$$$^$9!#(B
794 \subsection{Pushing changes to another repository}
796 Mercurial $B$G$O!"(B
797 $B8=:_:n6H$r9T$C$F$$$k%j%]%8%H%j$+$iB>$N%j%]%8%H%j$X$N!"(B
798 $BJQ99FbMF$NH?1G$,2DG=$G$9!#(B
799 $B@h$K<($7$?(B \hgcmd{pull} $B$NNc$HF1MM$K!"(B
800 $B$^$:$OJQ99H?1G@h$H$9$k$?$a$N0l;~E*$J%j%]%8%H%j$r:n@.$7$^$9!#(B
802 \interaction{tour.clone-push}
804 \hgcmd{outgoing} $B%3%^%s%I$O!"(B
805 $BB>$N%j%]%8%H%j$X$NH?1GBP>]$H$J$k%A%'%s%8%;%C%H$r0lMwI=<($7$^$9!#(B
807 \interaction{tour.outgoing}
809 $B$=$7$F(B \hgcmd{push} $B%3%^%s%I$,<B:]$NH?1G:n6H$r9T$$$^$9!#(B
811 \interaction{tour.push}
813 \hgcmd{pull} $B$HF1MM$K!"(B
814 \hgcmd{push} $B%3%^%s%I$OJQ99H?1G@h$N%j%]%8%H%jB&$K$*$$$F!"(B
815 $B:n6HNN0h%G%#%l%/%H%j$N99?7$O9T$$$^$;$s(B
816 $B!J(B\hgcmd{pull} $B$H0c$$!"(B
817 \hgcmd{push} $B$OJQ99H?1G@h$N%j%]%8%H%jB&$G$N:n6HNN0h%G%#%l%/%H%j$r99?7$9$k(B
818 \texttt{-u} $B%*%W%7%g%s$r;}$A$^$;$s!K!#(B
820 $BEv3:%j%]%8%H%j$,4{$KAjEv$9$k%A%'%s%8%;%C%H$r;}$C$F$$$k>l9g!"(B
821 $BJQ99$N<h$j9~$_$"$k$$$OH?1G$r9T$&$H$I$&$J$k$N$G$7$g$&!)(B
822 $B6C$/$h$&$J$3$H$O2?$b5/$3$j$^$;$s!#(B
824 \interaction{tour.push.nothing}
826 \subsection{Sharing changes over a network}
828 $B@h$N4v$D$+$N@a$G?($l$?%3%^%s%I$NMxMQ$O!"(B
829 $B<j85$K$"$k%j%]%8%H%j$K$N$_8BDj$5$l$F$$$k$o$1$G$O$"$j$^$;$s!#(B
830 $BA4$/F1MM$N7A<0$G!"(B
831 $B%M%C%H%o!<%/@\B37PM3$G$b5!G=$7$^$9!#(B
832 $B%m!<%+%k%U%!%$%k%7%9%F%`$N%Q%9$NBe$o$j$K!"(B
833 URL $B$r;XDj$9$l$PNI$$$N$G$9!#(B
835 \interaction{tour.outgoing.net}
837 $B$3$NNc$G$O!"(B
838 $B1s3V%j%]%8%H%j$KBP$7$FH?1G2DG=$JJQ99$N0lMw$r8+$k$3$H$,$G$-$^$9$,!"(B
839 $B$3$N%j%]%8%H%j$OF?L>$G$NJQ99H?1G$r5v$9$h$&$K$OEvA3$G$9$,@_Dj$5$l$F$$$^$;$s!#(B
841 \interaction{tour.push.net}
843 %%% Local Variables:
844 %%% mode: latex
845 %%% TeX-master: "00book"
846 %%% End: