Mercurial > hgbook

--- a/ja/concepts.tex	Thu Jun 18 19:11:36 2009 +0900
+++ b/ja/concepts.tex	Thu Jun 18 20:04:44 2009 +0900
@@ -2,24 +2,27 @@
 \chapter{$BIqBfN"(B}
 \label{chap:concepts}

-%Unlike many revision control systems, the concepts upon which
-%Mercurial is built are simple enough that it's easy to understand how
-%the software really works.  Knowing this certainly isn't necessary,
-%but I find it useful to have a ``mental model'' of what's going on.
+%Unlike many revision control systems, the concepts upon which Mercurial
+%is built are simple enough that it's easy to understand how the software
+%really works.  Knowing these details certainly isn't necessary, so it is
+%certainly safe to skip this chapter. However, I think you will get more
+%out of the software with a ``mental model'' of what's going on.

 $BB?$/$N%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$H0c$C$F!$(B Mercurial$B$NF0:n$N4pK\$H$J$C(B
-$B$F$$$k%3%s%;%W%H$rM}2r$9$k$3$H$OMF0W$$!%(B
-$B$3$l$rM}2r$9$k$3$H$OI,$:$7$bI,MW$G$O$J$$$,!$I.<T$O!$2?$,5/$-$F$$$k$N$+$K(B
-$B$D$$$F%b%G%k$r0U<1$7$F$$$k$3$H$OM-MQ$G$"$k$H9M$($F$$$k!%(B
+$B$F$$$k35G0$rM}2r$9$k$3$H$OMF0W$$!%$3$l$i$N>\:Y$rM}2r$9$k$3$H$OI,$:$7$bI,(B
+$BMW$G$O$J$/!$$3$N>O$rHt$P$7$F$b:9$7;Y$($J$$!%$7$+$7I.<T$O!$%=%U%H%&%'%"$r(B
+$B$h$j$h$/;H$&>e$G2?$,5/$-$F$$$k$N$+$K$D$$$F%b%G%k$r0U<1$7$F$$$k$3$H$OM-MQ(B
+$B$G$"$k$H9M$($F$$$k!%(B

-%This understanding gives me confidence that Mercurial has been
-%carefully designed to be both \emph{safe} and \emph{efficient}.  And
-%just as importantly, if it's easy for me to retain a good idea of what
-%the software is doing when I perform a revision control task, I'm less
-%likely to be surprised by its behaviour.
+%Being able to understand what's going on behind the scenes gives me
+%confidence that Mercurial has been carefully designed to be both
+%\emph{safe} and \emph{efficient}. And just as importantly, if it's easy
+%for me to retain a good idea of what the software is doing when I
+%perform a revision control task, I'm less likely to be surprised by its
+%behaviour.

-$B$3$N$3$H$rM}2r$7$?8e$G!$I.<T$O(BMercurial$B$,(B\emph{$B0BA4(B}$B$H(B\emph{$B8zN((B}$B$r<B8=$9(B
-$B$k$h$&$KCm0U?<$/@_7W$5$l$F$$$k$H3N?.$9$k$K;j$C$?!%(B
+$BIqBfN"$G2?$,5/$3$C$F$$$k$N$+M}2r$G$-$k$H!$I.<T$O(BMercurial$B$,(B\emph{$B0BA4(B}$B$H(B
+\emph{$B8zN((B}$B$r<B8=$9$k$h$&$KCm0U?<$/@_7W$5$l$F$$$k$H3N?.$9$k$3$H$,$G$-$?!%(B
 $B$^$?!$=EMW$JE@$H$7$F!$%j%S%8%g%s%3%s%H%m!<%k$NA`:n$r9T$&:]$K%=%U%H%&%'%"(B
 $B$,2?$r$9$k$N$+$r5-21$KN1$a$F$*$/$3$H$K$h$C$F!$IT0U$N5sF0$G6C$/$3$H$,>/$J(B
 $B$/$J$C$?!%(B
@@ -583,12 +586,13 @@
 %  commit afterwards, you'll thus create a new head, because your
 %  working directory isn't synced to whatever the current tip is.
 %
-%  I put the word ``error'' in quotes because all that you need to do
-%  to rectify this situation is \hgcmd{merge}, then \hgcmd{commit}.  In
-%  other words, this almost never has negative consequences; it just
-%  surprises people.  I'll discuss other ways to avoid this behaviour,
-%  and why Mercurial behaves in this initially surprising way, later
-%  on.
+%  I put the word ``error'' in quotes because all that you need to do to
+%  rectify this situation is \hgcmd{merge}, then \hgcmd{commit}. In other
+%  words, this almost never has negative consequences; it's just something
+%  of a surprise for newcomers.  I'll discuss other ways to avoid this
+%  behaviour, and why Mercurial behaves in this initially surprising way,
+%  later on.
+
 %\end{note}

 \begin{note}
@@ -596,19 +600,19 @@
 $B$$!%$=$l$O(B\hgcmd{pull}$B%3%^%s%I$r%*%W%7%g%s$J$7$G<B9T$9$k$3$H$G$"$k!%%G%U%)(B
 $B%k%H$G$O(B\hgcmd{pull}$B$O%o!<%-%s%0%G%#%l%/%H%j$N99?7$r(B\emph{$B9T$o$J$$(B}$B!%$=$N(B
 $B$?$a!$%j%]%8%H%j$K$O?7$7$$%A%'%s%8%;%C%H$,E~Ce$7$F$$$k$N$K%o!<%-%s%0%G%#(B
-$B%l%/%H%j$OA02s(Bpull$B$7$?%A%'%s%8%;%C%H$N$^$^$G$"$k!%$3$3$G$J$s$i$+$NJQ99$r(B
-$B9T$C$F%3%_%C%H$7$h$&$H$9$k$H!$%o!<%-%s%0%G%#%l%/%H%j$,8=:_$N(Btip$B$KF14|$7$F(B
-$B$$$J$$$?$a!$?7$?$J%X%C%I$r:n$k$3$H$K$J$C$F$7$^$&!%(B
+$B%l%/%H%j$OA02s(Bpull$B$7$?%A%'%s%8%;%C%H$N$^$^$G$"$k!%$3$3$G2?$i$+$NJQ99$r9T$C(B
+$B$F%3%_%C%H$7$h$&$H$9$k$H!$%o!<%-%s%0%G%#%l%/%H%j$,8=:_$N(Btip$B$KF14|$7$F$$$J(B
+$B$$$?$a!$?7$?$J%X%C%I$r:n$k$3$H$K$J$C$F$7$^$&!%(B

 ``$B%(%i!<(B''$B$H$$$&8@MU$r0zMQId$G3g$C$?$N$O!$$3$N>uBV$O(B\hgcmd{merge}$B$H(B
 \hgcmd{commit}$B$@$1$G2r>C$G$-$k$+$i$@!%8@$$BX$($k$H!$$3$N>uBV$O$[$H$s$I$N(B
-$B>l9g32$r$J$9$b$N$G$O$J$J$/!$C1$K%f!<%6$r6C$+$9DxEY$N$b$N$G$"$k!%$3$N?6Iq(B
+$B>l9g32$r$J$9$b$N$G$O$J$J$/!$C1$K=i?4<T$r6C$+$9DxEY$N$b$N$G$"$k!%$3$N?6Iq(B
 $B$rHr$1$kJL$NJ}K!$d!$$J$<(BMercurial$B$,$3$N$h$&$K6C$+$;$k$h$&$JJ}K!$GF0:n$9$k(B
 $B$N$+$K$D$$$F$O8e$[$I5DO@$9$k!%(B
 \end{note}

-%\subsection{Merging heads}
-\subsection{$B%X%C%I4V$N%^!<%8(B}
+%\subsection{Merging changes
+\subsection{$BJQ99$N%^!<%8(B}

 %When you run the \hgcmd{merge} command, Mercurial leaves the first
 %parent of the working directory unchanged, and sets the second parent
@@ -707,6 +711,27 @@
 $B$r0lEY$K%^!<%8$9$k$3$H$O5;=QE*$K$O2DG=$@$,!$%^!<%8$K$h$k:.Mp$r0z$-5/$3(B
 $B$7!$<}=&$,$D$+$J$/$J$k8+9~$_$,Bg$-$$!%(B

+\subsection{$B%^!<%8$H%j%M!<%`(B}
+%A surprising number of revision control systems pay little or no
+%attention to a file's \emph{name} over time.  For instance, it used to
+%be common that if a file got renamed on one side of a merge, the changes
+%from the other side would be silently dropped.
+
+$B6C$/$[$IB?$/$N%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$,(B\emph{$B%U%!%$%kL>(B}$B$NJQ2=$KCm(B
+$B0U$rJ'$C$F$$$J$$!%Nc$($P%^!<%8$N:]!$0lJ}$G%U%!%$%k$,%j%M!<%`$5$l$F$$$?>l(B
+$B9g!$$b$&0lJ}$NJQ99$O2?$N7Y9p$bL5$7$KGK4~$5$l$F$7$^$&!%(B
+
+%Mercurial records metadata when you tell it to perform a rename or
+%copy. It uses this metadata during a merge to do the right thing in the
+%case of a merge.  For instance, if I rename a file, and you edit it
+%without renaming it, when we merge our work the file will be renamed and
+%have your edits applied.
+
+Mercurial$B$O%j%M!<%`$d%3%T!<$r9T$&;~$K%a%?%G!<%?$r5-O?$7!$%^!<%8$r@5$7$/9T(B
+$B$&$?$a$KMxMQ$9$k!%Nc$($P$"$k%f!<%6$,%U%!%$%k$r%j%M!<%`$7!$JL$N%f!<%6$,%j(B
+$B%M!<%`$;$:$KF1$8%U%!%$%k$rJT=8$7$?$H$9$k$H!$%^!<%8$N:]$K%U%!%$%k$O%j%M!<(B
+$B%`$5$l!$$J$*$+$DJT=8FbMF$b<h$j9~$`!%(B
+
 %\section{Other interesting design features}
 \section{$B@_7W$NB>$N6=L#?<$$E@(B}