From owner-freebsd-stable  Wed Jul 10 15:17:47 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8A5E937B401
	for <freebsd-stable@FreeBSD.ORG>; Wed, 10 Jul 2002 15:17:43 -0700 (PDT)
Received: from postal3.es.net (postal3.es.net [198.128.3.207])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 92A3F43E58
	for <freebsd-stable@FreeBSD.ORG>; Wed, 10 Jul 2002 15:17:42 -0700 (PDT)
	(envelope-from oberman@es.net)
Received: from ptavv.es.net ([198.128.4.29])
        by postal3.es.net (Postal Node 3) with ESMTP id GQF37091;
        Wed, 10 Jul 2002 15:16:13 -0700
Received: from ptavv (localhost [127.0.0.1])
	by ptavv.es.net (Postfix) with ESMTP
	id E97EB5D03; Wed, 10 Jul 2002 15:17:40 -0700 (PDT)
To: Gerhard Sittig <Gerhard.Sittig@gmx.net>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: 4.6-RELEASE -> 4.5-RELENG 
In-reply-to: Your message of "Wed, 10 Jul 2002 21:40:51 +0200."
             <20020710214051.Q1494@shell.gsinet.sittig.org> 
Date: Wed, 10 Jul 2002 15:17:40 -0700
From: "Kevin Oberman" <oberman@es.net>
Message-Id: <20020710221740.E97EB5D03@ptavv.es.net>
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

> Date: Wed, 10 Jul 2002 21:40:51 +0200
> From: Gerhard Sittig <Gerhard.Sittig@gmx.net>
> Sender: owner-freebsd-stable@FreeBSD.ORG
> 
> On Wed, Jul 10, 2002 at 10:56 -0700, Kevin Oberman wrote:
> > 
> > [ ... upgrading from source ... ]
> > 
> > While there are a few niggles, the proper sequence  is:
> > mergemaster -p (This is NEW!)
> 
> Should this read "sh usr.sbin/mergemaster/mergemaster.sh -p" for
> the case where your in $PATH mergemaster(8) is just old enough to
> not know the -p switch or where it lacks needed preparation steps
> for the buildworld run to come?

Actually, I believe that it should. Thanks for pointing this out.


R. Kevin Oberman, Network Engineer
Energy Sciences Network (ESnet)
Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab)
E-mail: oberman@es.net			Phone: +1 510 486-8634

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message