comparison ja/collab.tex @ 835:8a3041e6f3cb

reflect comments by Hiroshi Someya.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 11 Jul 2009 19:25:35 +0900
parents 5276f40fca1c
children
comparison
equal deleted inserted replaced
834:896ab6eaf1c6 835:8a3041e6f3cb
131 131
132 $B<+J,$K$H$C$F40A4$H;W$($k%o!<%/%U%m!<%b%G%k$r9=C[$7$?$D$b$j$,!$6&F13+H/%A!<(B 132 $B<+J,$K$H$C$F40A4$H;W$($k%o!<%/%U%m!<%b%G%k$r9=C[$7$?$D$b$j$,!$6&F13+H/%A!<(B
133 $B%`$K$H$C$F$OBg$-$J6C$-$H3kF#$rM?$($F$7$^$C$?$3$H$,$"$k!%J#;($J%V%i%s%A$N(B 133 $B%`$K$H$C$F$OBg$-$J6C$-$H3kF#$rM?$($F$7$^$C$?$3$H$,$"$k!%J#;($J%V%i%s%A$N(B
134 $B=89g$,$J$<I,MW$J$N$+JQ99$,%V%i%s%A4V$G$I$N$h$&$KEAGE$9$k$N$+$r@bL@$7$?$K(B 134 $B=89g$,$J$<I,MW$J$N$+JQ99$,%V%i%s%A4V$G$I$N$h$&$KEAGE$9$k$N$+$r@bL@$7$?$K(B
135 $B$b$+$+$o$i$:!$4v?M$+$N%A!<%`%a%s%P!<$OH?H/$7$?!%H`$i$OAoL@$G$"$C$?$,!$;d(B 135 $B$b$+$+$o$i$:!$4v?M$+$N%A!<%`%a%s%P!<$OH?H/$7$?!%H`$i$OAoL@$G$"$C$?$,!$;d(B
136 $B$,94$C$?%k!<%k$,:n6H$KM?$($k@)8B$d!$%b%G%k$N:YIt$KM?$($k1F6A$KCm0U$rJ'$&(B 136 $B$N94$C$?%k!<%k$,:n6H$KM?$($k@)8B$d!$%b%G%k$N:YIt$KM?$($k1F6A$KCm0U$rJ'$&(B
137 $B$3$H$OK>$^$J$+$C$?!%(B 137 $B$3$H$rK>$^$J$+$C$?!%(B
138 138
139 %Don't sweep foreseeable social or technical problems under the rug. 139 %Don't sweep foreseeable social or technical problems under the rug.
140 %Whatever scheme you put into effect, you should plan for mistakes and 140 %Whatever scheme you put into effect, you should plan for mistakes and
141 %problem scenarios. Consider adding automated machinery to prevent, or 141 %problem scenarios. Consider adding automated machinery to prevent, or
142 %quickly recover from, trouble that you can anticipate. As an example, 142 %quickly recover from, trouble that you can anticipate. As an example,
504 %take their change. If the maintainer reviews their changes and agrees 504 %take their change. If the maintainer reviews their changes and agrees
505 %to take them, they'll pass them along to Linus in due course. 505 %to take them, they'll pass them along to Linus in due course.
506 506
507 Linus$B$OB?$/$N(B``$B?.Mj$G$-$kBe9T<T(B''$B$r;}$C$F$$$k!%86B'E*$K$OH`$OH`$i$,8x3+$7(B 507 Linus$B$OB?$/$N(B``$B?.Mj$G$-$kBe9T<T(B''$B$r;}$C$F$$$k!%86B'E*$K$OH`$OH`$i$,8x3+$7(B
508 $B$?$b$N$O2?$G$b(Bpull$B$9$k!%B?$/$N>l9g!$H`$i$NJQ99$r%l%S%e!<$9$k$3$H$b$7$J(B 508 $B$?$b$N$O2?$G$b(Bpull$B$9$k!%B?$/$N>l9g!$H`$i$NJQ99$r%l%S%e!<$9$k$3$H$b$7$J(B
509 $B$$!%Be9T<T$N2??M$+$O%a%s%F%J!<$H$J$k$3$H$rF10U$7$F$*$j!$%+!<%M%kFb$NFCDj(B 509 $B$$!%Be9T<T$N2??M$+$O%a%s%F%J$H$J$k$3$H$rF10U$7$F$*$j!$%+!<%M%kFb$NFCDj$N(B
510 $B$N%5%V%7%9%F%`$KBP$7$F@UG$$r;}$D!%%+!<%M%k%O%C%+!<$NC/$+$,(BLinus$B$N%D%j!<$N(B 510 $B%5%V%7%9%F%`$KBP$7$F@UG$$r;}$D!%%+!<%M%k%O%C%+!<$NC/$+$,(BLinus$B$N%D%j!<$N%5(B
511 $B%5%V%7%9%F%`$KJQ99$r2C$($?$$$H;W$C$?$i!$%5%V%7%9%F%`$N%a%s%F%J!<$r8+$D$1(B 511 $B%V%7%9%F%`$KJQ99$r2C$($?$$$H;W$C$?$i!$%5%V%7%9%F%`$N%a%s%F%J$r8+$D$1=P$7(B
512 $B=P$7$?>e$G!$%a%s%F%J!<$KJQ99$r<h$j9~$s$GLc$&$h$&$K0MMj$9$kI,MW$,$"$k!%%a(B 512 $B$?>e$G!$%a%s%F%J$KJQ99$r<h$j9~$s$GLc$&$h$&$K0MMj$9$kI,MW$,$"$k!%%a%s%F%J(B
513 $B%s%F%J!<$,JQ99$r%l%S%e!<$7!$<h$j9~$`$3$H$KF10U$9$l$P!$@5<0$J%3!<%9$GJQ99(B 513 $B$,JQ99$r%l%S%e!<$7!$<h$j9~$`$3$H$KF10U$9$l$P!$@5<0$J%3!<%9$GJQ99$r(BLinus$B$K(B
514 $B$r(BLinus$B$K<jEO$9!%(B 514 $B<jEO$9!%(B
515 515
516 %Individual lieutenants have their own approaches to reviewing, 516 %Individual lieutenants have their own approaches to reviewing,
517 %accepting, and publishing changes; and for deciding when to feed them 517 %accepting, and publishing changes; and for deciding when to feed them
518 %to Linus. In addition, there are several well known branches that 518 %to Linus. In addition, there are several well known branches that
519 %people use for different purposes. For example, a few people maintain 519 %people use for different purposes. For example, a few people maintain
551 %likely they are to trust your judgment and accept your changes. If 551 %likely they are to trust your judgment and accept your changes. If
552 %you're well-known and maintain a long-lived branch for something Linus 552 %you're well-known and maintain a long-lived branch for something Linus
553 %hasn't yet accepted, people with similar interests may pull your 553 %hasn't yet accepted, people with similar interests may pull your
554 %changes regularly to keep up with your work. 554 %changes regularly to keep up with your work.
555 555
556 $BBhFs$K!$$3$l$OI>H=$H>N;?$H$K$h$k%7%9%F%`$G$"$k$H$$$&$3$H$@!%L5L>$N3+H/<T(B 556 $BBhFs$K!$$3$l$OI>H=$H>N;?$K$h$k%7%9%F%`$G$"$k$H$$$&$3$H$@!%L5L>$N3+H/<T$N(B
557 $B$NJQ99$KBP$7$F$O(BLinus$B$O$*$=$i$/H?1~$9$k$3$H$J$/L5;k$9$k!%$7$+$7%5%V%7%9%F(B 557 $BJQ99$KBP$7$F$O(BLinus$B$O$*$=$i$/H?1~$9$k$3$H$J$/L5;k$9$k!%$7$+$7%5%V%7%9%F%`(B
558 $B%`%a%s%F%J$OJQ99$r%l%S%e!<$7!$E,@Z$G$"$k$HH=CG$9$l$P:N$jF~$l$k!%3+H/<T$,(B 558 $B%a%s%F%J$OJQ99$r%l%S%e!<$7!$E,@Z$G$"$k$HH=CG$9$l$P:N$jF~$l$k!%3+H/<T$,NI(B
559 $BNI$$JQ99$r9T$($P9T$&$[$I!$%a%s%F%J$O3+H/<T$NH=CG$r?.MQ$7!$JQ99$r:N$jF~$l(B 559 $B$$JQ99$r9T$($P9T$&$[$I!$%a%s%F%J$O3+H/<T$NH=CG$r?.MQ$7!$JQ99$r:N$jF~$l$k(B
560 $B$k$h$&$K$J$k$@$m$&!%3+H/<T$,CxL>$G!$(BLinus$B$,$$$^$@$K<u$1F~$l$F$$$J$$!$D94|(B 560 $B$h$&$K$J$k$@$m$&!%3+H/<T$,CxL>$G!$(BLinus$B$,$$$^$@$K<u$1F~$l$F$$$J$$!$D94|4V(B
561 $B4V$K$o$?$k%V%i%s%A$N%a%s%F%J$G$"$k$J$i$P!$F1$86=L#$r;}$D?M!9$,H`$N:n6H$r(B 561 $B$K$o$?$k%V%i%s%A$N%a%s%F%J$G$"$k$J$i$P!$F1$86=L#$r;}$D?M!9$,H`$N:n6H$r<h(B
562 $B<h$j9~$`$?$a$KJQ99$rDj4|E*$K(Bpull$B$9$k$3$H$@$m$&!%(B 562 $B$j9~$`$?$a$KJQ99$rDj4|E*$K(Bpull$B$9$k$3$H$@$m$&!%(B
563 563
564 %Reputation and acclaim don't necessarily cross subsystem or ``people'' 564 %Reputation and acclaim don't necessarily cross subsystem or ``people''
565 %boundaries. If you're a respected but specialised storage hacker, and 565 %boundaries. If you're a respected but specialised storage hacker, and
566 %you try to fix a networking bug, that change will receive a level of 566 %you try to fix a networking bug, that change will receive a level of
567 %scrutiny from a network maintainer comparable to a change from a 567 %scrutiny from a network maintainer comparable to a change from a
700 %computer, then use commands like \hgcmd{clone}, \hgcmd{incoming}, and 700 %computer, then use commands like \hgcmd{clone}, \hgcmd{incoming}, and
701 %so on to talk to that server as if the repository was hosted remotely. 701 %so on to talk to that server as if the repository was hosted remotely.
702 %This can help you to quickly get acquainted with using commands on 702 %This can help you to quickly get acquainted with using commands on
703 %network-hosted repositories. 703 %network-hosted repositories.
704 704
705 Mercurial$B$N(B\hgcmd{serve}$B%3%^%s%I$r;H$C$F!$<j85$N%3%s%T%e!<%?$G%j%]%8%H%j(B 705 Mercurial$B$N(B\hgcmd{serve}$B%3%^%s%I$r;H$C$F!$4JC1$K<j85$N%3%s%T%e!<%?$G%j%](B
706 $B%5!<%S%9$r9T$&$N$O4JC1$G$"$k!%1sJ}$K$"$k%5!<%P$H$d$j$H$j$9$k$N$HF1MM$K(B 706 $B%8%H%j%5!<%S%9$r9T$&$3$H$,$G$-$k!%1sJ}$K$"$k%5!<%P$H$d$j$H$j$9$k$N$HF1MM(B
707 \hgcmd{clone}$B!$(B\hgcmd{incoming}$BEy$N%3%^%s%I$r;H$&$3$H$,$G$-$k!%$3$l$O%j%](B 707 $B$K(B\hgcmd{clone}$B!$(B\hgcmd{incoming}$BEy$N%3%^%s%I$r;H$&$3$H$,$G$-$k!%$3$l$O%M%C(B
708 $B%8%H%j$r%M%C%H%o!<%/$GDs6!$9$k$3$H$K47$l$k$N$KLrN)$D$@$m$&!%(B 708 $B%H%o!<%/$G%j%]%8%H%j$rDs6!$9$kN}=,$K$J$k$@$m$&!%(B
709 709
710 %\subsection{A few things to keep in mind} 710 %\subsection{A few things to keep in mind}
711 \subsection{$B3P$($F$*$/$Y$-(B2, 3$B$NE@(B} 711 \subsection{$B3P$($F$*$/$Y$-(B2, 3$B$NE@(B}
712 712
713 %Because it provides unauthenticated read access to all clients, you 713 %Because it provides unauthenticated read access to all clients, you
971 %You should make your own judgment as to whether this is an acceptable 971 %You should make your own judgment as to whether this is an acceptable
972 %risk. It certainly saves a lot of repeated typing. 972 %risk. It certainly saves a lot of repeated typing.
973 973
974 $B%Q%9%U%l!<%:$r%(!<%8%'%s%H$K5-21$5$;$kJ@32$O!$%Q%o!<%5%$%/%k$r9T$C$F$b>l(B 974 $B%Q%9%U%l!<%:$r%(!<%8%'%s%H$K5-21$5$;$kJ@32$O!$%Q%o!<%5%$%/%k$r9T$C$F$b>l(B
975 $B9g$K$h$C$F$O<~E~$J<jCJ$rMQ$$$k967b<T$K%Q%9%U%l!<%:$N%W%l!<%s%F%-%9%H>pJs(B 975 $B9g$K$h$C$F$O<~E~$J<jCJ$rMQ$$$k967b<T$K%Q%9%U%l!<%:$N%W%l!<%s%F%-%9%H>pJs(B
976 $B$r<hF@$5$l$k2DG=@-$,$"$k$3$H$G$"$k!%$3$N%j%9%/$,5vMF$GCe$kJ*2TF/$+$O<+J,(B 976 $B$r<hF@$5$l$k2DG=@-$,$"$k$3$H$G$"$k!%$3$N%j%9%/$,5vMF$G$-$k$+$I$&$+$O<+J,(B
977 $B<+?H$GH=CG$7$FM_$7$$!%$3$NJ}K!$rMQ$$$k$3$H$G!$%?%$%W2s?t$r8:$i$;$k$3$H$O(B 977 $B<+?H$GH=CG$7$FM_$7$$!%$3$NJ}K!$rMQ$$$k$3$H$G!$%?%$%W2s?t$r8:$i$;$k$3$H$O(B
978 $B3N$+$G$"$k!%(B 978 $B3N$+$G$"$k!%(B
979 979
980 %On Unix-like systems, the agent is called \command{ssh-agent}, and 980 %On Unix-like systems, the agent is called \command{ssh-agent}, and
981 %it's often run automatically for you when you log in. You'll need to 981 %it's often run automatically for you when you log in. You'll need to
1285 $B%5!<%P$G(BMercurial$B$N(BCGI$B%5%]!<%H$rMxMQ$9$k$3$H$G$"$k!%(B 1285 $B%5!<%P$G(BMercurial$B$N(BCGI$B%5%]!<%H$rMxMQ$9$k$3$H$G$"$k!%(B
1286 1286
1287 %Depending on how ambitious you are, configuring Mercurial's CGI 1287 %Depending on how ambitious you are, configuring Mercurial's CGI
1288 %interface can take anything from a few moments to several hours. 1288 %interface can take anything from a few moments to several hours.
1289 1289
1290 $B$I$NDxEY$N$3$H$rA@$&$+$K$h$C$F!$(BMercurial$B$N(BCGI$B%$%s%?%U%'!<%9$N@_Dj$K$O?t(B 1290 Mercurial$B$N(BCGI$B%$%s%?%U%'!<%9$N@_Dj$K$+$+$k;~4V$O!$L\E*$H$9$k$H$3$m$K1~$8(B
1291 $BJ,$+$i?t;~4VDxEY$N;~4V$,$+$+$k!%(B 1291 $B$F?tJ,$+$i?t;~4VDxEY$NI}$,$"$k!%(B
1292 1292
1293 %We'll begin with the simplest of examples, and work our way towards a 1293 %We'll begin with the simplest of examples, and work our way towards a
1294 %more complex configuration. Even for the most basic case, you're 1294 %more complex configuration. Even for the most basic case, you're
1295 %almost certainly going to need to read and modify your web server's 1295 %almost certainly going to need to read and modify your web server's
1296 %configuration. 1296 %configuration.
1440 \url{http://myhostname/~myuser/hgweb.cgi} $B$r3+$/!%$7$+$7$3$N(BURL$B$K%"%/%;%9(B 1440 \url{http://myhostname/~myuser/hgweb.cgi} $B$r3+$/!%$7$+$7$3$N(BURL$B$K%"%/%;%9(B
1441 $B$7$F$b%(%i!<$,$G$k2DG=@-$,9b$$$N$G!$Mn$ACe$$$FM_$7$$!%%(%i!<$K$OB?$/$NM}(B 1441 $B$7$F$b%(%i!<$,$G$k2DG=@-$,9b$$$N$G!$Mn$ACe$$$FM_$7$$!%%(%i!<$K$OB?$/$NM}(B
1442 $BM3$,9M$($i$l!$<B:]!$$=$N$9$Y$F$K0z$C3]$+$C$F$$$k2DG=@-$,9b$$$N$G!$0J2<$N(B 1442 $BM3$,9M$($i$l!$<B:]!$$=$N$9$Y$F$K0z$C3]$+$C$F$$$k2DG=@-$,9b$$$N$G!$0J2<$N(B
1443 $B5-=R$rCm0U?<$/FI$s$GM_$7$$!%$3$3$K5s$2$?$N$O!$(BFedora~7$B$G!$?75,$K%$%s%9%H!<(B 1443 $B5-=R$rCm0U?<$/FI$s$GM_$7$$!%$3$3$K5s$2$?$N$O!$(BFedora~7$B$G!$?75,$K%$%s%9%H!<(B
1444 $B%k$5$l$?(BApache$B$H!$$3$NNcBj$N$?$a$K?75,$K:n@.$7$?%f!<%6%"%+%&%s%H$GI.<T$,(B 1444 $B%k$5$l$?(BApache$B$H!$$3$NNcBj$N$?$a$K?75,$K:n@.$7$?%f!<%6%"%+%&%s%H$GI.<T$,(B
1445 $B<B:]$K$GAx6x$7$?LdBj$G$"$k!%(B 1445 $B<B:]$KAx6x$7$?LdBj$G$"$k!%(B
1446 1446
1447 %Your web server may have per-user directories disabled. If you're 1447 %Your web server may have per-user directories disabled. If you're
1448 %using Apache, search your config file for a \texttt{UserDir} 1448 %using Apache, search your config file for a \texttt{UserDir}
1449 %directive. If there's none present, per-user directories will be 1449 %directive. If there's none present, per-user directories will be
1450 %disabled. If one exists, but its value is \texttt{disabled}, then 1450 %disabled. If one exists, but its value is \texttt{disabled}, then
1516 1516
1517 %If you find that Apache serves you the text of the CGI script instead 1517 %If you find that Apache serves you the text of the CGI script instead
1518 %of executing it, you may need to either uncomment (if already present) 1518 %of executing it, you may need to either uncomment (if already present)
1519 %or add a directive like this. 1519 %or add a directive like this.
1520 Apache$B$,(BCGI$B%9%/%j%W%H$r<B9T$9$k$N$G$O$J$/!$%9%/%j%W%H<+BN$N%F%-%9%H$rAw$C(B 1520 Apache$B$,(BCGI$B%9%/%j%W%H$r<B9T$9$k$N$G$O$J$/!$%9%/%j%W%H<+BN$N%F%-%9%H$rAw$C(B
1521 $B$F$/$k>l9g$O!$0J2<$N%G%#%l%/%F%#%V$rDI2C$9$k$+!$$9$G$KB8:_$7$F%3%a%s%H%"(B 1521 $B$F$/$k>l9g$O!$0J2<$N%G%#%l%/%F%#%V$rDI2C$9$k!%%G%#%l%/%F%#%V$,$9$G$K$"$j!$(B
1522 $B%&%H$5$l$F$$$l$P!$%"%s%3%a%s%H$9$k!%(B 1522 $B%3%a%s%H%"%&%H$5$l$F$$$k$N$J$i!$M-8z2=$9$k!%(B
1523 \begin{codesample2} 1523 \begin{codesample2}
1524 AddHandler cgi-script .cgi 1524 AddHandler cgi-script .cgi
1525 \end{codesample2} 1525 \end{codesample2}
1526 1526
1527 %The next possibility is that you might be served with a colourful 1527 %The next possibility is that you might be served with a colourful
1851 % repository over~HTTP. If set to \texttt{no} or \texttt{false}, only 1851 % repository over~HTTP. If set to \texttt{no} or \texttt{false}, only
1852 % the ``human-oriented'' portion of the web interface is available. 1852 % the ``human-oriented'' portion of the web interface is available.
1853 \item[\rcitem{web}{allowpull}] $B%V!<%kCM!%%j%b!<%H%f!<%6$K%&%'%V%$%s%?%U%'!<(B 1853 \item[\rcitem{web}{allowpull}] $B%V!<%kCM!%%j%b!<%H%f!<%6$K%&%'%V%$%s%?%U%'!<(B
1854 $B%9$rMQ$$$?(B~HTTP$B$K$h$k(B\hgcmd{pull}$B5Z$S(B\hgcmd{clone}$B$r5v2D$9(B 1854 $B%9$rMQ$$$?(B~HTTP$B$K$h$k(B\hgcmd{pull}$B5Z$S(B\hgcmd{clone}$B$r5v2D$9(B
1855 $B$k$+$I$&$+$r7h$a$k!%(B\texttt{no}$B$^$?$O(B\texttt{false}$B$N>l9g!$(B 1855 $B$k$+$I$&$+$r7h$a$k!%(B\texttt{no}$B$^$?$O(B\texttt{false}$B$N>l9g!$(B
1856 $B%&%'%V%$%s%?%U%'!<%9$O?M4V$N1\Mw$N$_$,2DG=$K$J$k!%(B 1856 $B%&%'%V%$%s%?%U%'!<%9$O%V%i%&%6$K$h$k1\Mw$N$_$,2DG=$K$J$k!%(B
1857 1857
1858 %\item[\rcitem{web}{contact}] String. A free-form (but preferably 1858 %\item[\rcitem{web}{contact}] String. A free-form (but preferably
1859 % brief) string identifying the person or group in charge of the 1859 % brief) string identifying the person or group in charge of the
1860 % repository. This often contains the name and email address of a 1860 % repository. This often contains the name and email address of a
1861 % person or mailing list. It often makes sense to place this entry in 1861 % person or mailing list. It often makes sense to place this entry in
2064 %file inside a repository that is owned by a different user. If we clone 2064 %file inside a repository that is owned by a different user. If we clone
2065 %or pull changes from such a repository, Mercurial will print a warning 2065 %or pull changes from such a repository, Mercurial will print a warning
2066 %stating that it does not trust their \filename{.hg/hgrc}. 2066 %stating that it does not trust their \filename{.hg/hgrc}.
2067 2067
2068 $B%7%9%F%`A4BN$N(B\filename{hgrc}$B%U%!%$%k$,M-MQ$J>l9g$N0lNc$K!$B>$N%f!<%6$,=j(B 2068 $B%7%9%F%`A4BN$N(B\filename{hgrc}$B%U%!%$%k$,M-MQ$J>l9g$N0lNc$K!$B>$N%f!<%6$,=j(B
2069 $BM-?t(Br$B%j%]%8%H%j$+$i(Bpull$B$9$k>l9g$,$"$k!%%G%U%)%k%H$G$O(BMercurial$B$OJL$N%f!<(B 2069 $BM-$9$k%j%]%8%H%j$+$i(Bpull$B$9$k>l9g$,$"$k!%%G%U%)%k%H$G$O(BMercurial$B$OJL$N%f!<(B
2070 $B%6$N=jM-$9$k%j%]%8%H%jFb$K$"$k(B\filename{.hg/hgrc}$B%U%!%$%k$N$[$H$s$I$N9`L\(B 2070 $B%6$N=jM-$9$k%j%]%8%H%jFb$K$"$k(B\filename{.hg/hgrc}$B%U%!%$%k$N$[$H$s$I$N9`L\(B
2071 $B$r?.Mj$7$J$$!%$=$N$h$&$J%j%]%8%H%j$+$i%/%m!<%s$dJQ99$N(Bpull$B$r9T$&(B 2071 $B$r?.Mj$7$J$$!%$=$N$h$&$J%j%]%8%H%j$+$i%/%m!<%s$dJQ99$N(Bpull$B$r9T$&(B
2072 $B$H!$(BMercurial$B$O(B\filename{.hg/hgrc}$B$r?.Mj$7$J$$$H$$$&7Y9p$rI=<($9$k!%(B 2072 $B$H!$(BMercurial$B$O(B\filename{.hg/hgrc}$B$r?.Mj$7$J$$$H$$$&7Y9p$rI=<($9$k!%(B
2073 2073
2074 %If everyone in a particular Unix group is on the same team and 2074 %If everyone in a particular Unix group is on the same team and