From owner-cvs-all  Sat Jun 22  1:58:19 2002
Delivered-To: cvs-all@freebsd.org
Received: from overcee.wemm.org (12-232-114-102.client.attbi.com [12.232.114.102])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0811337B444; Sat, 22 Jun 2002 01:56:53 -0700 (PDT)
Received: from wemm.org (localhost [127.0.0.1])
	by overcee.wemm.org (Postfix) with ESMTP
	id 31108380E; Sat, 22 Jun 2002 01:56:56 -0700 (PDT)
	(envelope-from peter@wemm.org)
X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4
To: Doug Barton <DougB@FreeBSD.org>
Cc: "David E. O'Brien" <obrien@FreeBSD.org>,
	cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, gordon@FreeBSD.org,
	Mike Makonnen <makonnen@pacbell.net>
Subject: Re: cvs commit: src/etc/rc.d - Imported sources 
In-Reply-To: <3D13E5C4.504DE4D9@FreeBSD.org> 
Date: Sat, 22 Jun 2002 01:56:56 -0700
From: Peter Wemm <peter@wemm.org>
Message-Id: <20020622085656.31108380E@overcee.wemm.org>
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

Doug Barton wrote:
> "David E. O'Brien" wrote:
> > 
> > obrien      2002/06/21 12:07:21 PDT
> > 
> >   src/etc/rc.d - Imported sources
> >   Update of /home/ncvs/src/etc/rc.d
> >   In directory freefall.freebsd.org:/c/tmp/cvs-serv42453
> > 
> >   Log Message:
> >   Sync with NetBSD's mainline.
> 
> Ummm.... two questions. Did you coordinate this change (and the import
> of sbin/rcorder) with Mike or Gordon? Second, what do you plan to do
> with the conflicts? We're actively working on this stuff now, so I'm not
> sure that this import is a Good Thing, but maybe I missed something...

There are no conflicts.  He just imported the baseline from netbsd onto the
vendor branch.  This import changes nothing.

> >   72 conflicts created by this import.
> >   Use the following command to help the merge:
> > 
> >         cvs checkout -jNETBSD:yesterday -jNETBSD src/etc/rc.d
> > 
> 
> -- 
>    "We have known freedom's price. We have shown freedom's power.
>       And in this great conflict, ...  we will see freedom's victory."
> 	- George W. Bush, President of the United States
>           State of the Union, January 28, 2002
> 
>          Do YOU Yahoo!?
> 

Cheers,
-Peter
--
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com
"All of this is for nothing if we don't go to the stars" - JMS/B5


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message