From owner-freebsd-stable Wed Jun 21 23:53:32 2000 Delivered-To: freebsd-stable@freebsd.org Received: from mppsystems.com (mppsystems.com [208.210.148.205]) by hub.freebsd.org (Postfix) with ESMTP id A5E0037B837 for ; Wed, 21 Jun 2000 23:53:26 -0700 (PDT) (envelope-from mpp@mppsystems.com) Received: (from mpp@localhost) by mppsystems.com (8.9.3/8.9.3) id BAA11923; Thu, 22 Jun 2000 01:53:09 -0500 (CDT) (envelope-from mpp) Date: Thu, 22 Jun 2000 01:53:09 -0500 From: Mike Pritchard To: "Daniel O'Connor" Cc: Mike Harding , freebsd-stable@FreeBSD.ORG Subject: Re: Softupdates disappears? Message-ID: <20000622015309.A11875@mppsystems.com> References: <20000622042626.C02ADE6FF8@netcom1.netcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: ; from doconnor@gsoft.com.au on Thu, Jun 22, 2000 at 02:01:34PM +0930 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, Jun 22, 2000 at 02:01:34PM +0930, Daniel O'Connor wrote: > > On 22-Jun-00 Mike Harding wrote: > > I have been doing cvsup at least weekly for at long time and this is > > the first time that this has happened. > > Hmm :-/ > > I guess it could have something to do with the softupdates commit but I doubt > it.. > > NFI then really, sorry. I think it had to do with the latest softupdates commit. My cvsup from tonight told me that ufs/ffs/*softdep* had conflicts and that I have to move the existing files out of the way (they were symlinks to the real sources before the commit). That was with -current. I think the original mentioned 4.0 sources, so that might be some kind of cvs problem now that those file exist as non-symlinks in a different branch. -Mike -- Mike Pritchard mpp@FreeBSD.org or mpp@mppsystems.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message