From owner-FreeBSD-users-jp@jp.FreeBSD.org Sun May 26 02:43:46 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g4PHhkE51753;
	Sun, 26 May 2002 02:43:46 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from is1.mh.itc.u-tokyo.ac.jp ([133.11.205.11])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g4PHhkv51748
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sun, 26 May 2002 02:43:46 +0900 (JST)
	(envelope-from tamaru@myn.rcast.u-tokyo.ac.jp)
Received: from is1.mh.itc.u-tokyo.ac.jp (is1.mh.itc.u-tokyo.ac.jp [127.0.0.1])
	by is1.mh.itc.u-tokyo.ac.jp (Postfix) with ESMTP id 0DDA92180E9
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sun, 26 May 2002 02:43:41 +0900 (JST)
Received: from mailhosting.itc.u-tokyo.ac.jp (IDENT:mirapoint@mailhosting.itc.u-tokyo.ac.jp [133.11.205.3])
	by is1.mh.itc.u-tokyo.ac.jp (8.11.3/8.11.3) with ESMTP id g4PHhfF11962
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Sun, 26 May 2002 02:43:41 +0900
Received: from amulet.ht.myn.rcast.u-tokyo.ac.jp (YahooBB219001110022.bbtec.net [219.1.110.22])
	by mailhosting.itc.u-tokyo.ac.jp (Mirapoint Messaging Server MOS 2.9.3.2)
	with ESMTP id AGI40836;
	Sun, 26 May 2002 02:43:40 +0900 (JST)
Date: Sun, 26 May 2002 02:44:28 +0900
Message-ID: <sa67klscebn.wl@amulet.ht.myn.rcast.u-tokyo.ac.jp>
From: Hiroharu Tamaru <tamaru@myn.rcast.u-tokyo.ac.jp>
To: FreeBSD-users-jp@jp.FreeBSD.org
References: <ybsk7qowkuk.wl@ett.sat.t.u-tokyo.ac.jp>
 <3CCF7819.1D954221@nanet.co.jp>
 <200205010535.OAA29557@mail1.rim.or.jp>
User-Agent: Wanderlust/2.8.1 (Something) Emacs/21.2 Mule/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: FreeBSD-users-jp 68687
Subject: [FreeBSD-users-jp 68687] mergemaster
Errors-To: owner-FreeBSD-users-jp@jp.FreeBSD.org
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: tamaru@myn.rcast.u-tokyo.ac.jp

$BED4]$G$9!#(B

$B40A4$K=PCY$l$F$7$^$$$^$7$?$,!"$;$C$+$/OCBj$K$J$C$?$N$G!D!#(B

$B3'$5$s(B mergemaster $B$r;H$o$l$F$$$k$+!"$=$b$=$bIaCJ$O$H$/$K(B
merge $B$7$J$$$+$N$I$A$i$+$,B?$$$h$&$G$9$,!"$=$l0J30$N4IM}J}K!(B
$B$r$H$i$l$F$$$kJ}$O$$$i$C$7$c$i$J$$$s$G$7$g$&$+(B?

$B;d$O!"(B2.2.x $B$N;~Be$+$i(B /etc/ $B0J2<B>$r(B cvs $B$G4IM}$7$F$$$F!"(B
$B$$$^$@$K$=$l$rF'=1$7$F$$$^$9!#:Y$+$$(B tips $B$O$$$m$$$m$"$k$N$G(B
$B$9$,!"35MW$H$7$F$O!"(B

cd /usr/src/etc
make distrib-dirs distribution DESTDIR=/tmp/config
cd /tmp/config
($B4JC1$J(B clean up script $B$rAv$i$;$k(B)
cvs -d /var/cvs import -m "import after cvsup" config \
  FreeBSD_core RELENG_4_20020520

$B$H$$$&46$8$G(B installworld $B$9$k$?$S$K(B vendor branch $B$K<h$j9~(B
$B$s$G$$$^$9!#$=$N$"$H!"(Bmessage $B$K=>$$(B vendor branch $B$N:9J,$r(B
trunk $B$K<h$j9~$s$@>e$G(B / $B$K(B check out $B$7$F$"$k$H$3$m$G(Bupdate 
$B$7$F$$$^$9!#(B

mkdir /tmp/work
cd /tmp/work
cvs -d /var/cvs co -jFreeBSD_core:yesterday -jFreeBSD_core config
cd config
...
cd /tmp/work/config
cvs commit -m "merged after cvsup"

cd /
cvs update

rm -r /tmp/config /tmp/work 

$B$3$l$@$H!"(Bcvs $B$N5!G=$,;H$($k$N$G!"$?$H$($P(B

cvs diff -Nu -D"yesterday"
... update $B$NA08e$G$N<+J,$NJQ99FbMF$r3NG'$G$-$k!#(B

cvs diff -Nu -r RELENG_4_20020401 -r RELENG_4_20020508
... original $B$,$3$N4V$I$&=$@5$5$l$?$+3NG'$G$-$k!#(B

cvs diff -Nu -r FreeBSD_core
... $B<+J,$,(B original $B$KBP$7$F$I$&$$$&=$@5$r$7$?$N$+3NG'$G$-$k(B

$B$"$?$j$,JXMx$G$9!#(Bmergemaster $B$b2?EY$H$J$/;H$C$F$_$?$N$G$9$,!"(B
$BFk@w$a$J$/$F7k6I$3$NJ}<0$K$b$I$C$F$-$F$7$^$$$^$9!#(B

$B@N$O$$$m$$$m(B hack $B$,I,MW$@$C$?$N$G$9$,!":G6a$O$=$l$i$bB?$/$,(B
$BITMW$K$J$j!":#$I$-$a$s$I$&$J$N$O(B sendmail.cf $B$H(B freebsd.cf 
$B$/$i$$$G$9(B($Id:$ tag $B$,F~$C$F$$$k$+$i$3$l$,=q$-JQ$o$C$F(B 
noise $B$K$J$k(B)$B!#(B

# $B6=L#$N$"$kJ}$,$$$i$C$7$c$l$P$b$&>/$7@bL@$7$^$9!#(B

mergemaster $B$,=i$a$F(B RELEASE $B$KEP>l$7$?$N$O(B repository $B$K$h(B
$B$k$H(B 3.4-RELEASE $B$G$9$+$i!"$=$l0JA0$+$i;H$C$F$$$??M$O$=$l0J(B
$BA0$N(B knowhow $B$r7Q>5$7$F$$$?$j$7$J$$$N$G$7$g$&$+(B?



$BJX>h$G(B1$B$D(Bcvs$B$N<ALd$r(B:

branch $B>e$GF|IU;XDj$G(B diff $B$r$H$k$N$C$F$G$-$J$$$h$&$J$-$,$9(B
$B$k$N$G$9$,!"$3$NG'<1$O@5$7$$$G$9$+(B? $B$D$^$j!"(B

cvs diff -D yesterday -r HEAD
cvs -d /var/cvs co -jFreeBSD_core:yesterday -jFreeBSD_core config

$B",$3$&$$$&$3$H$O$G$-$k$1$I!"(B

cvs diff -rFreeBSD_core:yesterday -rFreeBSD_core

$B",$3$l$O$G$-$J$$!"$H!#$G$-$FNI$5$=$&$J5$$,$9$k$N$G!"(B
$B$$$m$$$m;n$7$?$D$b$j$J$N$G$9$,!"$&$^$/$$$+$J$$$G$9!#(B
$B$4B8CN$G$7$?$i65$($F2<$5$$!#(B
-- 
$BED4](B $BGn@2(B tamaru@myn.rcast.u-tokyo.ac.jp
