From owner-cvs-all Fri Jun 21 19:49:49 2002 Delivered-To: cvs-all@freebsd.org Received: from mail-relay1.yahoo.com (mail-relay1.yahoo.com [216.145.48.34]) by hub.freebsd.org (Postfix) with ESMTP id A58AE37B40A; Fri, 21 Jun 2002 19:49:43 -0700 (PDT) Received: from FreeBSD.org (12-234-90-219.client.attbi.com [12.234.90.219]) by mail-relay1.yahoo.com (Postfix) with ESMTP id 43C7D8B5C5; Fri, 21 Jun 2002 19:49:41 -0700 (PDT) Message-ID: <3D13E5C4.504DE4D9@FreeBSD.org> Date: Fri, 21 Jun 2002 19:49:40 -0700 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.79 [en] (X11; U; FreeBSD 4.6-RELEASE i386) X-Accept-Language: en MIME-Version: 1.0 To: "David E. O'Brien" Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, gordon@FreeBSD.org, Mike Makonnen Subject: Re: cvs commit: src/etc/rc.d - Imported sources References: <200206211907.g5LJ7Li42640@freefall.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG "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... > 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!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message