From owner-freebsd-stable@FreeBSD.ORG  Fri Sep  5 10:58:52 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
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 E029716A4BF
	for <freebsd-stable@freebsd.org>;
	Fri,  5 Sep 2003 10:58:52 -0700 (PDT)
Received: from postal2.es.net (proxy.es.net [198.128.3.206])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09D2343F85
	for <freebsd-stable@freebsd.org>;
	Fri,  5 Sep 2003 10:58:52 -0700 (PDT)	(envelope-from oberman@es.net)
Received: from ptavv.es.net ([198.128.4.29])
        by postal2.es.net (Postal Node 2) with ESMTP (SSL) id MUA74016;
        Fri, 05 Sep 2003 10:58:50 -0700
Received: from ptavv (localhost [127.0.0.1])
	by ptavv.es.net (Tachyon Server) with ESMTP
	id B10C35D04; Fri,  5 Sep 2003 10:58:49 -0700 (PDT)
To: "Michael E. Mercer" <mmercer@nc.rr.com>
In-Reply-To: Message from "Michael E. Mercer" <mmercer@nc.rr.com> 
	<1062784498.367.54.camel@dual.mmercer.com> 
Date: Fri, 05 Sep 2003 10:58:49 -0700
From: "Kevin Oberman" <oberman@es.net>
Message-Id: <20030905175849.B10C35D04@ptavv.es.net>
cc: freebsd-stable@freebsd.org
cc: Kenneth W Cochran <kwc@TheWorld.com>
Subject: Re: mergemaster error, sendmail, RELENG_4 
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2003 17:58:53 -0000

> From: "Michael E. Mercer" <mmercer@nc.rr.com>
> Date: Fri, 05 Sep 2003 13:54:58 -0400
> Sender: owner-freebsd-stable@freebsd.org
> 
> I just asked this same question...
> 
> You gotta install the new version of mergemaster before running it.
> /usr/src/usr.sbin/mergemaster
> make install 

Or just run the new version out of the tree:
/usr/src/usr.sbin/mergemaster.sh
-- 
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