From owner-man-jp-reviewer@jp.freebsd.org  Tue Nov 23 12:30:40 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA43425;
	Tue, 23 Nov 1999 12:30:40 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from multi.rim.or.jp ([202.247.191.124])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id MAA43417
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 12:30:40 +0900 (JST)
	(envelope-from kuma@nk.rim.or.jp)
Received: from mail-relay.rim.or.jp (megumi [10.20.49.22]) by multi.rim.or.jp (3.7W/HMX-12) id MAA27362 for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 12:30:40 +0900 (JST)
Received: from laurel.nk.rim.or.jp (JYOcc-03p60.ppp.odn.ad.jp [210.231.75.60]) by mail-relay.rim.or.jp (3.7W/HMX-12) id MAA17447 for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 12:30:38 +0900 (JST)
Received: from oasis.laurel.nk.rim.or.jp by laurel.nk.rim.or.jp (8.9.3/8.9.3oasis991011) with ESMTP id MAA05631
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 12:07:41 +0900 (JST)
Message-Id: <199911230307.MAA05631@laurel.nk.rim.or.jp>
To: man-jp-reviewer@jp.freebsd.org
In-reply-to: Your message of "Tue, 23 Nov 1999 05:59:32 JST."
	 <14393.44724.22751.90839F@tkc.att.ne.jp> 
Date: Tue, 23 Nov 1999 12:07:41 +0900
From: Norihiro Kumagai <kuma@nk.rim.or.jp>
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: man-jp-reviewer 1683
Subject: [man-jp-reviewer 1683] Re: mergemaster.8 
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: kuma@nk.rim.or.jp

$B7'C+$G$9!#(B

In Message <14393.44724.22751.90839F@tkc.att.ne.jp>,
  Motomichi Matsuzaki <mzaki@e-mail.ne.jp> writes:
> mergemaster(8) $B$O!"(Bmake world $B$7$?$"$H!"(B /etc $B$r99?7$9$k$H$-$K!"(B
> $B$$$-$J$j(B /etc $B$K=q$-9~$s$G$$$/$H@_Dj$r>e=q$-$7$A$c$&$N$G!"(B
> $BJL$N>l=j$K?7$7$$(B /etc $B$r=q$-9~$s$G$,$s$,$s(B diff $B$r$H$k$H$$$&(B
> $B%9%/%j%W%H$J$s$G$9$,!"(B

$B!t(B  $BM>CL$G$9$,!"!V$,$s$,$s(B diff $B$r$H$k!W$H$$$&$N$,%J%$%9$G$9!#(B

> $B$=$N!VJL$N>l=j!W$r<($9(B
> temporary root environment $B$H$$$&%U%l!<%:$d$=$N0!<o$,(B
> $B;H$o$l$F$$$k$N$G$9$,!"$I$&F|K\8l$K$7$FNI$$$b$N$d$iG:$s$G$$$^$9!#(B
> # $B:#$O!V0l;~E*$J(B root $B4D6-!W(B

$B!V2>$N(B root $B4D6-!W!VEv:B$N(B root $B4D6-!W(B

$B!t(B  $B!V@$$r$7$N$V2>$N;Q!W$H$$$&%U%l!<%:$r;W$$=P$5$l$?$7!#(B

> $B$3$N%9%/%j%W%H$O(B
> .Pa /usr/src/etc/Makefile
> $B$r;H$C$F0l;~E*$J(B root $B4D6-$r(B 
> .Pa /
> $B$h$j2<$K:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B

$B$3$l$O!"(Ba temporary root environment from / down $B$G$9$M!#(B"from / down" 
$B$O(B root environment $B$K78$k7AMF;l6g$H$_$F!"(B

   / $B$K;O$^$k0l;~E*$J(B root $B4D6-$r:n@.$7!"(B

$B$G$I$&!#(B
$B$=$NB>$b$m$b$m$r(B diff $B$K$7$F$_$^$7$?!#(B

--
$B7'C+(B $BE5Bg(B

--- mergemaster.8-org	Tue Nov 23 11:19:21 1999
+++ mergemaster.8	Tue Nov 23 12:05:38 1999
@@ -51,9 +51,9 @@
 .Pp
 $B$3$N%9%/%j%W%H$O(B
 .Pa /usr/src/etc/Makefile
-$B$r;H$C$F0l;~E*$J(B root $B4D6-$r(B 
+$B$r;H$C$F(B
 .Pa /
-$B$h$j2<$K:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B
+$B$+$i;O$^$k2>$N(B root $B4D6-$r:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B
 .Op Fl m
 $B%3%^%s%I%i%$%s%*%W%7%g%s$G0c$&%=!<%9%G%#%l%/%H%j$r;XDj$9$k$3$H$b$G$-$^$9!#(B
 $B$=$7$F$=$N4D6-Cf$N$=$l$>$l$N%U%!%$%k$r!"(B
@@ -66,14 +66,14 @@
 $B?75l$N%U%!%$%k$r(B
 .Xr sdiff 1
 $B$r;H$C$FE,@Z$K%^!<%8$9$k!"(B
-$B8e$G<j$G%^!<%8$9$k$?$a$K%U%!%$%k$r0l;~E*$J(B root $B4D6-$K;D$7$F$*$/!"(B
+$B8e$G<j$G%^!<%8$9$k$?$a$K%U%!%$%k$r2>$N(B root $B4D6-$K;D$7$F$*$/!"(B
 $B$N$$$:$l$+$rA*$Y$^$9!#(B
 .Pp
 $B%G%U%)%k%H$G$O!"(B
 .Pa /var/tmp/temproot
-$B$K0l;~E*$J(B root $B$r:n$j!"(B
+$B$K2>$N(B root $B$r:n$j!"(B
 .Xr cvs 1
-$B%P!<%8%g%s$N(B $Id/$FreeBSD $BJ8;zNs$,$"$k%U%!%$%k$K$D$$$F$O$=$l$rHf3S$7$F!"(B
+$B%P!<%8%g%sJ8;zNs(B $Id/$FreeBSD $B$,$"$k%U%!%$%k$K$D$$$F$O$=$l$rHf3S$7$F!"(B
 $B$b$7F1$8$G$"$l$P0l;~%U%!%$%k$r:o=|$7$^$9!#(B
 $Id $BJ8;zNs$,$J$$;~$d!"$"$C$F$b0lCW$7$J$$>l9g$K$O!"(B
 $B%U%!%$%k$=$N$b$N$rHf3S$7$^$9!#(B
@@ -81,9 +81,11 @@
 .Pp
 .Nm
 $B$O(B umask $B$rD4$Y$F!"(B 022 $B0J30$G$"$l$P7Y9p$r=P$7$^$9!#(B
-$BB?$/$N@_Dj%U%!%$%k$O(B world read $B%Q!<%_%C%7%g%s$rM?$($kI,MW$O$"$j$^$;$s$,!"(B
+$B$[$H$s$I$N@_Dj%U%!%$%k$K(B world read $B%Q!<%_%C%7%g%s$rM?$($k$3$H$,(B
+$B6/@)$5$l$F$$$k$o$1$G$O$"$j$^$;$s$,!"(B
 $B$=$&$7$J$$$HLdBj$K$J$k$+$b$7$l$^$;$s!#(B
-$B$b$7(B 022 $B0J30(B $B$N(B umask $B$rA*$s$@>l9g!"8e$N%H%i%V%k$N860x$K$J$k$+$b$7$l$^$;$s!#(B
+$B$b$7(B 022 $B0J30(B $B$N(B umask $B$rA*$S!"$"$H$G2?$i$+$N%H%i%V%k$,@8$8$?>l9g!"(B
+$B$=$N860x$,$3$l$+$b$7$l$^$;$s!#(B
 .Pa /etc/master.passwd
 $B$OFCNc$H$7$F07$$$^$9!#(B
 $B$3$N%U%!%$%k$J$$$7%^!<%8$7$?%U%!%$%k$r%$%s%9%H!<%k$9$k$3$H$rA*Br$9$k$H!"(B
@@ -94,11 +96,11 @@
 $B$r(B -p $B%*%W%7%g%sIU$-$G<B9T$7$F!"(B
 $B%Q%9%o!<%I%G!<%?%Y!<%9$N:F9=C[$H(B
 .Pa /etc/passwd
-$B$N:n$jD>$7$r$5$;$J$1$l$P$J$i$J$$$G$7$g$&!#(B
+$B$N:n$jD>$7$r$5$;$kI,MW$,$"$j$^$9!#(B
 .Pp
 $B%9%/%j%W%H$O!"(B
 .Pa /usr/src/etc/Makefile
-$B$,%U%!%$%k$r:n@.$7$?;~$N=jM-<T$*$h$S%0%k!<%W(B ID $B$H!"(B
+$B$,:n@.$7$?%U%!%$%k$KIU$1$?=jM-<T(B ID $B$*$h$S%0%k!<%W(B ID $B$H!"(B
 umask $B$K$h$C$F;XDj$5$l$?%U%!%$%k%Q!<%_%C%7%g%s$rMQ$$$^$9!#(B
 context diff $B$rA*$P$J$$8B$j!"(B
 $B%G%U%)%k%H$G(B unified diff $B$r;H$C$F:9J,$rI=<($7$^$9!#(B
@@ -110,9 +112,8 @@
 .It Fl c
 unified diff $B$NBe$o$j$K(B context diff $B$rMQ$$$^$9!#(B
 .It Fl r
-.Nm
-$B$r0JA0A]=|$7$?%G%#%l%/%H%j$G:F<B9T$9$k$3$H$G!"(B
-$B0l;~E*$J(B root $B4D6-$r:n$k$3$H$r>J$-$^$9!#(B
+$B2>$N(B root $B4D6-$r?75,$K:n$k$3$H$r$;$:$K!"(B
+$B0JA0A]=|$7$?%G%#%l%/%H%j$G:F<B9T$7$^$9!#(B
 $B$3$N%*%W%7%g%s$OB>$NA4$F$N%*%W%7%g%s$H0l=o$K;H$($^$9!#(B
 .It Fl v
 $B=hM}$K$D$$$F$h$j>iD9$K=PNO$7$^$9!#(B
@@ -141,13 +142,13 @@
 $B$r<B9T$9$k%G%#%l%/%H%j$N%Q%9$r;XDj$7$^$9!#(B
 $B!J8@$$BX$($k$H%=!<%9$N>l=j$G$9!#(B -s $B$,$b$&;H$o$l$F$$$k$N$G!K(B
 .It Fl t Ar /path/to/temp/root
-$B0l;~E*$J(B root $B4D6-$r%G%U%)%k%H$N(B
+$B2>$N(B root $B4D6-$r%G%U%)%k%H$N(B
 .Pa /var/tmp/temproot
 $B$NBe$o$j$K(B
 .Pa /path/to/temp/root
 $B$K:n$j$^$9!#(B
 .It Fl d
-$B0l;~E*$J(B root $B%G%#%l%/%H%j$NL>A0$K!"F|IU$H;~4V$rB-$7$^$9!#(B
+$B2>$N(B root $B%G%#%l%/%H%j$NL>A0$K!"F|IU$H;~4V$rB-$7$^$9!#(B
 -t $B%*%W%7%g%s$r;XDj$7$F$$$k$H$-$O!"(B
 $BF|IU$rB-$7$?$$$J$i$3$N%*%W%7%g%s$O$=$N8e$m$K$D$1$J$1$l$P$J$j$^$;$s!#(B
 .It Fl u Ar N
@@ -179,12 +180,12 @@
 .Pp
 context diff $B$r;H$$!"$+$D(B
 .Nm
-$B$,?JD=$K=>$C$F$?$/$5$s$N@bL@$r$9$k$h$&$K$9$k$K$O(B:
+$B$,=hM}$,?J$`$K$D$l!"$h$j$?$/$5$s$N@bL@$r$9$k$h$&$K$9$k$K$O(B:
 .Pp
 .Dl # mergemaster -cv
 .Pp
 .Nm
-$B$,0l;~E*$J(B root $B4D6-$r(B
+$B$,2>$N(B root $B4D6-$r(B
 .Pa /usr/tmp/root
 $B$K:n$k$h$&$K;XDj$9$k$K$O(B:
 .Pp
@@ -206,7 +207,7 @@
 # mergemaster $B$N%*%W%7%g%s$,!"%G%U%)%k%HCM$H$H$b$K0lMw$7$F$"$j$^$9(B
 # $B0J2<$N%*%W%7%g%s$O%3%^%s%I%i%$%s$,>e=q$-$7$^$9(B
 #
-# $B0l;~E*$J(B root $B4D6-$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j(B
+# $B2>$N(B root $B4D6-$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j(B
 #TEMPROOT='/var/tmp/temproot'
 #
 # CVS $Id $B$N8!::$r>JN,$7$FA4$F$N%U%!%$%k$rHf3S$9$k87L)$JHf3S(B
@@ -258,9 +259,9 @@
 .Pp
 $B%3%^%s%I%i%$%s%*%W%7%g%s$,IT@5(B
 .Pp
-$B0l;~E*$J(B root $B4D6-$r:n@.$9$k$N$K<:GT$7$?(B
+$B2>$N(B root $B4D6-$r:n@.$9$k$N$K<:GT$7$?(B
 .Pp
-$B0l;~E*$J(B root $B$K%U%!%$%k$r3JG<$9$k$N$K<:GT$7$?!#(B
+$B2>$N(B root $B$K%U%!%$%k$r3JG<$9$k$N$K<:GT$7$?!#(B
 .Pp
 .Sh $BNr;K(B
 .Nm
@@ -270,7 +271,7 @@
 $B$b$C$HC1=c$J7A$G(B
 .Pa comproot
 $B$H$$$&L>A0$G:G=i$K8x3+$5$l$^$7$?!#(B
-$B0l;~E*$J(B root $B4D6-$r:n$k$H$$$&%"%$%G%"$O!"(B
+$B2>$N(B root $B4D6-$r:n$k$H$$$&%"%$%G%"$O!"(B
 $B>e$G;2>H$7$?(B Nik Clayton $B$N(B make world tutorial $B$+$iMh$F$$$^$9!#(B
 .Pp
 .Sh $B:n<T(B
@@ -278,7 +279,7 @@
 .An Douglas Barton Aq Doug@gorean.org
 $B$,=q$-$^$7$?!#(B
 .Sh $B%P%0(B
-$B:#$N=j$o$+$C$F$$$k%P%0$O$"$j$^$;$s!#(B
+$B:#$N$H$3$m$o$+$C$F$$$k%P%0$O$"$j$^$;$s!#(B
 $B$J$K$+LdBj$d!"%3%a%s%H$d!"Ds0F$,$"$l$P!"$I$&$+:n<T$^$GJs9p$7$F$/$@$5$$!#(B
 $B$3$N%W%m%0%i%`$K$J$5$l$?2~NI$N$$$/$D$+$O(B
 $B%f!<%6$+$i$NDs0F$K$h$k$b$N$G$9!#$"$j$,$H$&!#(B
