From owner-freebsd-stable  Tue Jun  4 18:44:17 1996
Return-Path: owner-stable
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id SAA00896
          for stable-outgoing; Tue, 4 Jun 1996 18:44:17 -0700 (PDT)
Received: from time.cdrom.com (time.cdrom.com [204.216.27.226])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id SAA00886
          for <freebsd-stable@freebsd.org>; Tue, 4 Jun 1996 18:44:13 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.7.5/8.6.9) with SMTP id SAA06870; Tue, 4 Jun 1996 18:42:12 -0700 (PDT)
To: Dave Hayes <dave@kachina.jetcafe.org>
cc: freebsd-stable@freebsd.org
Subject: Re: What's wrong with this picture? 
In-reply-to: Your message of "Tue, 04 Jun 1996 14:51:43 PDT."
             <199606042151.OAA18917@kachina.jetcafe.org> 
Date: Tue, 04 Jun 1996 18:42:12 -0700
Message-ID: <6867.833938932@time.cdrom.com>
From: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Sender: owner-stable@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> On a FreeBSD 2.1.0-RELEASE system:
> 
> # 
> # sup stable-supfile
> ..
> # cd /usr/src
> # make world
> [failure elided]

Don't worry about it - this was all cleaned up recently and should be
committing shortly.

Basically, -stablefolk, I got the mega-uncommit ready to go which
would return -stable to the idyllic days before I tried this merge and
I set it to committing when I went to bed.  However, when I woke up, I
saw that it had been spinning for 10 hours (I was tired :-) on a
repository lock from some earlier failed CVS op and failed to go
through.  Whoops.  Sorry, some things are beyond my control! :-)

I'm just re-syncing my 2.1 tree since people have committed to it in
the interim (!@#^$%* CVS and its bogus non-conflict resolution code!)
and will start the commit again as soon as it finishes.

Sorry about the delay, folks!

					Jordan