Mercurial > hgbook
diff ja/intro.tex @ 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 11 Jul 2009 19:25:35 +0900 |
parents | fa1c3715254d |
children |
line wrap: on
line diff
--- a/ja/intro.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/intro.tex Sat Jul 11 19:25:35 2009 +0900 @@ -11,10 +11,9 @@ %new name that contains a number, each one higher than the number of %the preceding version. -$B%j%S%8%g%s%3%s%H%m!<%k$H$O!$J#?t$N%P!<%8%g%s$N>pJs$r$r4IM}$9$k%W%m%;%9$G(B -$B$"$k!%:G$bC1=c$JJ}K!$O!$%U%!%$%k$rJQ99$7$?$i!$$=$l$^$G$N%P!<%8%g%s$h$j$b(B -$BBg$-$J?t;z$r4^$`?7$?$JL>A0$G%;!<%V$r9T$&$J$I$NJ}K!$GA4$F<j$G9T$&$3$H$G$"(B -$B$k!%(B +$B%j%S%8%g%s%3%s%H%m!<%k$H$O!$J#?t$N%P!<%8%g%s$N>pJs$r4IM}$9$k%W%m%;%9$G$"(B +$B$k!%:G$bC1=c$JJ}K!$O!$%U%!%$%k$rJQ99$7$?$i!$$=$l$^$G$N%P!<%8%g%s$h$j$bBg(B +$B$-$J?t;z$r4^$`?7$?$JL>A0$G%;!<%V$r9T$&$J$I$NJ}K!$GA4$F<j$G9T$&$3$H$G$"$k!%(B %Manually managing multiple versions of even a single file is an %error-prone task, though, so software tools to help automate this @@ -54,9 +53,9 @@ % makes it easier for you to collaborate. For example, when people % more or less simultaneously make potentially incompatible changes, % the software will help you to identify and resolve those conflicts. - \item $BB>$N?M$H:n6H$7$F$$$k;~!$%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$O6&F1(B - $B:n6H$r=u$1$k!%Nc$($P!$?M!9$,F1;~$K8_49@-$N$J$$JQ99$r9T$C$?>l9g!$(B - $B%=%U%H%&%'%"$O%3%s%U%j%/%H$rFCDj$7!$2D7h$9$k$3$H$r=u$1$k!%(B + \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$OB>$N?M$H$N6&F1:n6H$r=u$1$k!%Nc(B + $B$($P!$J#?t$N%f!<%6$,F1;~$K8_49@-$N$J$$JQ99$r9T$C$?>l9g!$%=%U%H%&%'(B + $B%"$N;Y1g$G%3%s%U%j%/%H$rFCDj$72r7h$9$k$3$H$,$G$-$k!%(B %\item It can help you to recover from mistakes. If you make a change % that later turns out to be in error, you can revert to an earlier % version of one or more files. In fact, a \emph{really} good @@ -84,10 +83,10 @@ %\emph{benefits} compare to its \emph{costs}. A revision control tool %that's difficult to understand or use is going to impose a high cost. -$B%j%S%8%g%s%3%s%H%m!<%k$N<BMQ@-$K4X$9$k80$K$J$k<ALd$O!$$3$l$i$N(B2$B$D$N0[$J$C(B -$B$?%9%1!<%k!J(B``$B0l?M$N%O%C%+!<(B''$B%l%Y%k$+$i(B``$BBg5,LO%A!<%`(B''$B%l%Y%k$^$G!K$K$*(B -$B$$$F!$%3%9%H$KBP$7$F$I$l$@$1Mx1W$,$"$k$N$+$H$$$&$3$H$G$"$k!%M}2r$d;HMQ$,(B -$B:$Fq$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O9b$$%3%9%H$r2!$7$D$1$k!%(B +$B%j%S%8%g%s%3%s%H%m!<%k$,<BMQE*$G$"$k$+$I$&$+H=CG$9$k80$O!$$5$^$6$^$J3+H/(B +$B%9%1!<%k!J(B``1$B?M$N%O%C%+!<(B''$B%l%Y%k$+$i(B``$BBg5,LO%A!<%`(B''$B%l%Y%k$^$G!K$K$*$$(B +$B$F!$;YJ'$&%3%9%H$KBP$7$F$I$l$@$18zG=$,F@$i$l$k$+$H$$$&$3$H$G$"$k!%M}2r$d(B +$B;HMQ$,:$Fq$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O9b$$%3%9%H$r2]$9$3$H$K$J$k!%(B %A five-hundred-person project is likely to collapse under its own %weight almost immediately without a revision control tool and process. @@ -96,9 +95,8 @@ %guaranteed. 500$B?M$+$i$J$k%W%m%8%'%/%H$G$O!$%j%S%8%g%s%3%s%H%m!<%k%D!<%k$J$7$G$OKX$s$I(B -$BN)$A9T$+$J$$!%$3$N>l9g!$%j%S%8%g%s%3%s%H%m!<%k$J$7$G$O<:GT$9$k$3$H$,KX$s(B -$B$IL@Gr$J$?$a!$%j%S%8%g%s%3%s%H%m!<%k$r9T$&%3%9%H$rJ'$&$3$H$OFC$KLdBj$H$O(B -$B$J$i$J$$!%(B%xxx +$BN)$A9T$+$J$$!%$3$N>l9g!$%j%S%8%g%s%3%s%H%m!<%k$J$7$G$OL@$i$+$K<:GT$9$k$?(B +$B$a!$%j%S%8%g%s%3%s%H%m!<%k$r9T$&%3%9%H$OFC$KLdBj$H$O$J$i$J$$!%(B%xxx %On the other hand, a one-person ``quick hack'' might seem like a poor %place to use a revision control tool, because surely the cost of using @@ -243,12 +241,13 @@ %``pain level'' of fixing these architectural problems prohibitive. 1990$BG/BeCf:"$K$J$k$H!$(BCVS$B$NLdBj$,9-$/CN$i$l$k$h$&$K$J$C$F$-$?!%(B CVS$B$O0lEY(B -$B$KJ#?t$N%U%!%$%k$KBP$7$F9T$o$l$kJQ99$rO@M}E*$K%"%H%_%C%/$JA`:n$H$7$F%0%k!<(B -$B%W2=$9$k$N$G$O$J$/!$%U%!%$%kKh$K8DJL$K5-O?$7$F$$$?!%(BCVS$B$N%U%!%$%k%R%(%i%k(B -$B%-!<$N4IM}$OIT==J,$G!$%U%!%$%k$d%G%#%l%/%H%j$r%j%M!<%`$9$k$H4JC1$K%j%]%8(B -$B%H%j$,:.Mp$7$?!%$5$i$K0-$$$3$H$K!$(BCVS$B$N%=!<%9%3!<%I$OFI$_$K$/$/!$%a%s%F%J(B -$B%s%9$bFq$7$+$C$?$?$a!$%"!<%-%F%/%A%c$NLdBj$r2r7h$9$k$N$OIT2DG=$J%l%Y%k$H(B -$B8@$($?!%(B +$B$KJ#?t$N%U%!%$%k$KBP$7$F9T$o$l$kJQ99$rO@M}E*$K%"%H%_%C%/$JA`:n(B +\footnote{$BLuCm!'$"$?$+$b86;R$N$h$&$K!$J#?t$NMWAG$KJ,2r$G$-$J$$A`:n$r8@$&(B}$B$H(B +$B$7$F%0%k!<%W2=$9$k$N$G$O$J$/!$%U%!%$%kKh$K8DJL$K5-O?$7$F$$$?!%(BCVS$B$N%U%!%$(B +$B%k%R%(%i%k%-!<$N4IM}$OIT==J,$G!$%U%!%$%k$d%G%#%l%/%H%j$r%j%M!<%`$9$k$H4J(B +$BC1$K%j%]%8%H%j$,:.Mp$7$?!%$5$i$K0-$$$3$H$K!$(BCVS$B$N%=!<%9%3!<%I$OFI$_$K$/(B +$B$/!$%a%s%F%J%s%9$bFq$7$+$C$?$?$a!$%"!<%-%F%/%A%c$NLdBj$r2r7h$9$k$N$OIT2D(B +$BG=$J%l%Y%k$H8@$($?!%(B %In 2001, Jim Blandy and Karl Fogel, two developers who had worked on %CVS, started a project to replace it with a tool that would have a @@ -322,12 +321,12 @@ $BBhFs@$Be$N%D!<%k$O!$%M%C%H%o!<%/Cf?4$N%"!<%-%F%/%A%c$K0\9T$9$k$3$H$G!$$=(B $B$l$^$G$N@)8B$r4KOB$7!$%W%m%8%'%/%HA4BN$rF1;~$K4IM}$7$?!%%W%m%8%'%/%H$,Bg(B -$B$-$/@.D9$9$k$H!$?7$?$JLdBj$KD>LL$7$?!%%/%i%$%"%s%H$,%5!<%P$KIQHK$KDL?.$9(B +$B$-$/@.D9$9$k$H!$?7$?$JLdBj$KD>LL$7$?!%%/%i%$%"%s%H$H%5!<%P$,IQHK$KDL?.$9(B $B$k$?$a!$Bg5,LO%W%m%8%'%/%H$G$O%5!<%P$N5,LO$,LdBj$K$J$C$?!%?.Mj@-$N$J$$%M%C(B $B%H%o!<%/@\B3$O%j%b!<%H%f!<%6$,%5!<%P$HDL?.$9$k$N$rK8$2$?!%%*!<%W%s%=!<%9(B $B%W%m%8%'%/%H$,%3%_%C%H8"$N$J$$%f!<%6$K$bF?L>$NFI$_=P$7@lMQ%"%/%;%9$rDs6!(B -$B$9$k$h$&$K$J$k$H!$%D!<%k$OH`$i$N9T$C$?JQ99$r5-O?$G$-$J$$$?$a!$%W%m%8%'%/(B -$B%H$H$d$j$H$j$r9T$&<+A3$J<jCJ$H$O8@$($J$$$3$H$,$o$+$C$?!%(B +$B$9$k$h$&$K$J$k$H!$%f!<%6$i$O$3$l$i$N%D!<%k$,9T$C$?JQ99$r5-O?$G$-$:!$%W%m(B +$B%8%'%/%H$H$N$d$j$H$j$,ITJX$G$"$k$3$H$KITK~$rJg$i$;$F$$$C$?!%(B %The current generation of revision control tools is peer-to-peer in %nature. All of these systems have dropped the dependency on a single @@ -403,12 +402,12 @@ %you have a far-flung team of collaborators, this may be significant. $BJ,;6%D!<%k$G$O!$%M%C%H%o!<%/$N?.Mj@-$NM?$($k1F6A$O=8Cf%D!<%k$KHf$Y$FMZ$+(B -$B$K>.$5$$!%=8Cf%D!<%k$O!$$$$/$D$+$NBg$-$J@)8B$N$"$k%3%^%s%I$r=|$$$F%M%C%H(B -$B%o!<%/@\B3$J$7$K;HMQ$G$-$J$$!%J,;6%D!<%k$G$O:n6HCf$K%M%C%H%o!<%/@\B3$,CG(B -$B$?$l$?$H$7$F$b$=$l$K5$$E$/$3$H$9$i$J$$$@$m$&!%B>$N%3%s%T%e!<%?$N%j%]%8%H(B -$B%j$H$NDL?.$r9T$&F0:n$N$_$,1F6A$r<u$1$k!%$3$N$h$&$JF0:n$O%m!<%+%k$G$NF0:n(B -$B$h$jAjBPE*$K>/$J$$$O$:$@!%$3$l$,=EBg$JLdBj$H$J$k$N$O!$9-HO0O$K$o$?$k%A!<(B -$B%`$G:n6H$r$7$F$$$k>l9g$G$"$m$&!%(B +$B$K>.$5$$!%=8Cf%D!<%k$O!$%M%C%H%o!<%/$K@\B3$7$J$1$l$P!$Bg$-$J@)8B$N$"$k$$(B +$B$/$D$+$N%3%^%s%I0J30$O;HMQ$G$-$J$$!%J,;6%D!<%k$G$O:n6HCf$K%M%C%H%o!<%/@\(B +$BB3$,CG$?$l$?$H$7$F$b$=$l$K5$$E$/$3$H$9$i$J$$$@$m$&!%B>$N%3%s%T%e!<%?$N%j(B +$B%]%8%H%j$H$NDL?.$r9T$&F0:n$N$_$,1F6A$r<u$1$k!%$3$N$h$&$JF0:n$O%m!<%+%k$G(B +$B$NF0:n$h$jAjBPE*$K>/$J$$$O$:$@!%$3$l$,=EBg$JLdBj$H$J$k$N$O!$9-HO0O$K$o$?(B +$B$k%A!<%`$G:n6H$r$7$F$$$k>l9g$G$"$m$&!%(B %\subsection{Advantages for open source projects} \subsection{$B%*!<%W%s%=!<%9%W%m%8%'%/%H$G$NMxE@(B} @@ -464,7 +463,7 @@ $BCf%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$G$O!$:90[$r(B\emph{$B5;=QE*$K(B}$B2r7h$9$k2aDx$K(B $B:$Fq$rH<$$!$B?$/$N>l9g!$<jF0$G2r>C$9$kI,MW$,$"$k!%$I$N%j%S%8%g%sMzNr$r;D(B $B$9$N$+7h$a!$$[$+$N%A!<%`$K$h$kJQ99$r%D%j!<$X$J$s$i$+$NJ}K!$G7Q$.LZ$9$kI,(B -$BMW$,$"$k!%$3$NA`:n$G$O!$DL>o!$0lJ}$N%j%S%8%g%sMzNr$N0lIt$^$?$OA4BN$r<:$&(B +$BMW$,$"$k!%$3$NA`:n$G$O!$DL>o!$0lJ}$N%j%S%8%g%sMzNr$N0lIt$^$?$OA4$F$r<:$&(B $B$3$H$K$J$k!%(B %What distributed tools do with respect to forking is they make forking @@ -491,7 +490,7 @@ %to as a ``fork'' becomes \emph{purely} a social issue. If anything, %distributed tools \emph{lower} the likelihood of a fork: -$B3F?M$,>o$K9T$&:n6H$NCGJR$,%U%)!<%/$H%^!<%8$K0LCVIU$1$i$l$k$J$i$P!$%*!<%W(B +$B3F?M$,9T$&A4$F$NItJ,:n6H$,%U%)!<%/$H%^!<%8$K0LCVIU$1$i$l$k$J$i$P!$%*!<%W(B $B%s%=!<%93&$O(B``$B%U%)!<%/(B''$B$r(B\emph{$B=c?h$K(B}$B<R2qE*$J;v>]$H$7$F07$&$@$m$&!%$$$:(B $B$l$K$;$hJ,;6%D!<%k$O%U%)!<%/$N38A3@-$r(B\emph{$B2<$2$k(B}$B!'(B @@ -506,8 +505,9 @@ \begin{itemize} \item $BCf1{=8CfE*$J%D!<%k$,2]$9!$%3%_%C%H8"$r;}$C$?FbIt$N?M4V$H;}$?$J$$30(B $BIt$N?M4V$N<R2qE*$J6hJL$r<h$j5n$k(B - \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$N4QE@$+$i$9$k$H!$F1$8%^!<%8$G$"(B - $B$k$?$a!$<R2qE*$J%U%)!<%/$N8e$K:90[$r2r>C$9$k$N$rMF0W$K$9$k!%(B + \item $B%j%S%8%g%s%3%s%H%m!<%k%=%U%H%&%'%"$N4QE@$+$i$OF1$8%^!<%8$G$"$k$?(B + $B$a!$3+H/%3%_%e%K%F%#$N%U%)!<%/8e$K@8$8$?:90[$r2r>C$9$k$N$,MF0W$K$J(B + $B$k!%(B \end{itemize} @@ -926,8 +926,8 @@ Perforce$B$N@-G=$O!$>.5,LO$J%A!<%`$G$N:n6H$K$*$$$F$O$+$J$jNI$$!%$7$+$7%f!<(B $B%6?t$,?t%@!<%90J>e$KA}2C$9$k$K=>$C$F!$5^7c$K0-$/$J$C$F$$$/!%$+$J$jBg5,LO(B -$B$J(BPerforce$B4D6-$G$O!$%f!<%6$NA`:n$K$h$kIi2Y$r7Z8:$9$k$?$a$N%W%m%-%7!<$,I,(B -$BMW$K$J$k!%(B +$B$J(BPerforce$B4D6-$G$O!$%f!<%6$NA`:n$K$h$kIi2Y$r7Z8:$9$k$?$a$N%W%m%-%7$,I,MW(B +$B$K$J$k!%(B %\subsection{Choosing a revision control tool} \subsection{$B%j%S%8%g%s%3%s%H%m!<%k%D!<%k$rA*$V(B}