Date: Fri, 21 Jun 2002 19:49:40 -0700 From: Doug Barton <DougB@FreeBSD.org> To: "David E. O'Brien" <obrien@FreeBSD.org> Cc: 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 Message-ID: <3D13E5C4.504DE4D9@FreeBSD.org> References: <200206211907.g5LJ7Li42640@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
"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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D13E5C4.504DE4D9>