From owner-freebsd-questions@FreeBSD.ORG  Thu Feb  9 18:44:35 2006
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: freebsd-questions@freebsd.org
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6688716A420
	for <freebsd-questions@freebsd.org>;
	Thu,  9 Feb 2006 18:44:35 +0000 (GMT)
	(envelope-from wo_shi_big_stomach@yahoo.com)
Received: from web32914.mail.mud.yahoo.com (web32914.mail.mud.yahoo.com
	[68.142.206.61]) by mx1.FreeBSD.org (Postfix) with SMTP id E900143D49
	for <freebsd-questions@freebsd.org>;
	Thu,  9 Feb 2006 18:44:34 +0000 (GMT)
	(envelope-from wo_shi_big_stomach@yahoo.com)
Received: (qmail 6398 invoked by uid 60001); 9 Feb 2006 18:44:34 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com;
	h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
	b=v44rI61jh39w9WpSL/fXfJBlBXDOZNuHjbbxkDsz9aEJBqzYzDiMR4Vpjse+2YliUCUADJ5FQB37NErSImamgCWhyQ/PqZkdTHLJsrFirZd5J7STtK6LS/bNrtM98/nxc2DCyBMM95cftNuUZKgRCOiwYb81k0SUmZ01IkGZG/c=
	; 
Message-ID: <20060209184434.6396.qmail@web32914.mail.mud.yahoo.com>
Received: from [64.239.163.238] by web32914.mail.mud.yahoo.com via HTTP;
	Thu, 09 Feb 2006 10:44:34 PST
Date: Thu, 9 Feb 2006 10:44:34 -0800 (PST)
From: wo_shi_big_stomach <wo_shi_big_stomach@yahoo.com>
To: freebsd-questions@freebsd.org
In-Reply-To: <43EB655C.8040601@mac.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Subject: Re: recovering from failed cvsup upgrade
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2006 18:44:35 -0000



--- Chuck Swiger <cswiger@mac.com> wrote:

> wo_shi_big_stomach wrote:
> > Greetings. I need help recovering a system that
> became
> > unresponsive during an upgrade. Steps:
> 
> Download the FreeBSD 5.4 .iso image, and do a binary
> upgrade installation from
> that.  You should have run "mergemaster -p" before
> the initial buildworld, and
> you should run mergemaster without the flag
> afterwards...

Thanks -- I have that system back. Whew.

The upgrade routine warned that it could not replace
the /usr/src tree and that cvsup was the right way to
do this.

To get this system from 5.4-RELEASE to RELENG_5_4, am
I ok just cvsup'ing src-all followed by the rest of
the steps you indicated?

If not, what steps will get the sources in sync?

thanks again!