From owner-FreeBSD-tech-jp@jp.freebsd.org  Sat May 16 00:01:57 1998
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) id AAA03011
	Sat, 16 May 1998 00:01:57 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) with ESMTP id AAA03000
	for <FreeBSD-tech-jp@jp.freebsd.org>; Sat, 16 May 1998 00:01:53 +0900 (JST)
Received: from sranhc.sra.co.jp (sranhc [133.137.20.3])
	by sraigw.sra.co.jp (8.8.7/3.6Wbeta7-sraigw) with ESMTP id AAA23563
	for <FreeBSD-tech-jp@jp.freebsd.org>; Sat, 16 May 1998 00:01:35 +0900 (JST)
Received: from srapc342.sra.co.jp (srapc342 [133.137.21.34])
	by sranhc.sra.co.jp (8.8.7/3.6Wbeta7-srambox) with ESMTP id AAA06341
	for <FreeBSD-tech-jp@jp.freebsd.org>; Sat, 16 May 1998 00:01:49 +0859 (JST)
Received: (from soda@localhost) by srapc342.sra.co.jp (8.8.8/3.4W-sra) id AAA03120 for FreeBSD-tech-jp@jp.freebsd.org; Sat, 16 May 1998 00:01:49 +0900 (JST)
Date: Sat, 16 May 1998 00:01:49 +0900 (JST)
From: Noriyuki Soda <soda@sra.co.jp>
Message-Id: <199805151501.AAA03120@srapc342.sra.co.jp>
To: FreeBSD-tech-jp@jp.freebsd.org
Reply-To: FreeBSD-tech-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=24]
X-Sequence: FreeBSD-tech-jp 1443
Subject: [FreeBSD-tech-jp 1443] Re: modifying CVSup'ed tree
Errors-To: owner-FreeBSD-tech-jp@jp.freebsd.org
Sender: owner-FreeBSD-tech-jp@jp.freebsd.org

> 	CVSup$B$N(Bcvs mode$B$G(Bcvs tree$B$r;}$C$FMh$?$H$3$m$r(BCVSROOT$B$K;XDj$7$F(B
> 	$B$$$8$/$C$F$_$?$i0l1~(Bcvs$B$O@5>oF0:n$7$?$N$G$9$,!"0J8e(BCVSup$B$9$k$H(B
> 	$B<j$b$H$G>!<j$K$D$1$/$o$($?(Bbranch tag$B$H$+$O>C$5$l$F$7$^$$$^$9!#(B
> 	CVSup$B$7$F$bBg>fIW$J%F$,$"$k$J$i$=$NJ}K!$r65$($F$$$?$@$1$k$H(B
> 	$B$`$A$c=u$+$j$^$9!#(B

$BLr$KN)$?$J$$Ez(B:

$B$=$N(B 1.	$B<+J,$NJQ99J,$K$D$$$F$O!"%P!<%8%g%s4IM}$rD|$a$k!#(B($B5c(B)
	CVSup $B$7$F!"(Bcvs update $B$9$k$H!"<+J,$N(B workspace $B$K>!<j$K%^!<%8(B
	$B$7$F$/$l$F9,$;!)(B ($B@dBP13(B)
	$B5c$/5c$/(B .#filename.X.Y. $B$H8+Hf$Y$F!"(Bconflict $B$r2r7h$9$k!#(B
	($B$3$l$O!"$I$&$$$&J}K!$r$H$C$F$bI,MW$+!D(B)

$B$=$N(B 2.	$B<+J,$N4IM}$9$kJL$N%j%]%8%H%j$K!"(B-current $B$r$"$i$?$a$F(B import $B$9$k!#(B
	($B$D$^$j!"$d$C$Q$jD|$a$k!#(B)

$B2?$+NI$$J}K!$,$"$l$P!";d$bCN$j$?$$$G$9!#(B

$B$U$D!<(B 2. $B$G$7$g$&$1$I!"$3$l$J$i4{$K(B itojun $B$5$s$O(B $B$d$C$F$$$k$o$1$G$9$h$M$(!D(B

[$B<XB-(B]
	2. $B$N>l9g!"(Bhttp://www.itojun.org/hack/cvs/tut-kernel.html $B$K(B
	$B$"$k$h$&$KKh2s%V%i%s%A$9$k$h$j$b!"(Bcvs $B$N(B vendor branch $B5!G=$r(B
	$BC1=c$K;H$C$F(B main trunk $B$G:n6H$7$?J}$,!"$+$($C$F3Z$+$b!D(B $B$H!"(B
	$B2s$j$N?M$HOC$F$^$9!#;d$O$=$&$7$F$^$9!#(B
	$B$J$*!"(Bimport $B8e$N%^!<%8$O(B cvs update $B$@$1$G$OBLL\$G!"(B
		cvs update -j$BA02s$N(Bimport$B;~$N%?%0(B  -j$B:#2s$N(Bimport$B;~$N%?%0(B
	$B$H$9$kI,MW$,$"$k!#$3$&$7$J$$$H!"A02s"*:#2s$G>C$($?%U%!%$%k$N(B
	cvs remove $B$,%9%1%8%e!<%k$5$l$^$;$s!#(B
--
soda$B!w(BFreeBSD-current $B$KBP$9$k2~B$$r$7$F$$$k$o$1$G$O$J$$$G$9$,!D(B
