From owner-freebsd-stable@FreeBSD.ORG  Sat May 30 18:58:12 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2D9C4106566B
	for <freebsd-stable@freebsd.org>; Sat, 30 May 2009 18:58:12 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4])
	by mx1.freebsd.org (Postfix) with ESMTP id B98B88FC13
	for <freebsd-stable@freebsd.org>; Sat, 30 May 2009 18:58:11 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 10070 invoked by uid 399); 30 May 2009 18:58:06 -0000
Received: from localhost (HELO foreign.dougb.net)
	(dougb@dougbarton.us@127.0.0.1)
	by localhost with ESMTPAM; 30 May 2009 18:58:06 -0000
X-Originating-IP: 127.0.0.1
X-Sender: dougb@dougbarton.us
Message-ID: <4A2181BC.6050701@FreeBSD.org>
Date: Sat, 30 May 2009 11:58:04 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Thunderbird 2.0.0.21 (X11/20090423)
MIME-Version: 1.0
To: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no>
References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no>
	<49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org>
	<4A0F4888.3070709@FreeBSD.org>
	<20090529235243.9468e09b.torfinn.ingolfsen@broadpark.no>
In-Reply-To: <20090529235243.9468e09b.torfinn.ingolfsen@broadpark.no>
X-Enigmail-Version: 0.95.7
OpenPGP: id=D5B2F0FB
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-stable@freebsd.org
Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 30 May 2009 18:58:12 -0000

Torfinn Ingolfsen wrote:
> On Sat, 16 May 2009 16:13:12 -0700
> Doug Barton <dougb@freebsd.org> wrote:
> 
>> You should be able to grab the file from HEAD and run it on
>> RELENG_[67] without any problems. I will MFC it as rapidly as
>> possible.
> 
> FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to
> 7.2-stable (csup'ed today). For the mergemaster steps in the "make
> world" procedure, I used
> 
> /usr/src/usr/sbin/mergemaster/mergemaster.sh
> 
> instead of just mergemaster.
> 
> Worked like a charm. Thanks!

Good news, thanks!


Doug

-- 

    This .signature sanitized for your protection