From owner-freebsd-stable@FreeBSD.ORG Tue May 5 21:40:42 2009 Return-Path: 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 EDED8106566C for ; Tue, 5 May 2009 21:40:42 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id 7C7F18FC0C for ; Tue, 5 May 2009 21:40:42 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 15598 invoked by uid 399); 5 May 2009 21:34:00 -0000 Received: from localhost (HELO 192.168.0.106) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 5 May 2009 21:34:00 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A00B0C1.4060009@FreeBSD.org> Date: Tue, 05 May 2009 14:33:53 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (X11/20090423) MIME-Version: 1.0 To: Cristiano Deana References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> In-Reply-To: X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Stable Mailing List 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2009 21:40:43 -0000 Cristiano Deana wrote: > On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen > wrote: > >> I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as >> of today, using csup and building world. > > i upgraded fw machines from _7_1 to _7_2. no problem at all here. > did mergemaster is changed from -RELEASE to -STABLE? The last change was before the 7.2-release cycle started (6 weeks ago). > hint: > use always -P option I agree, it's a good thing to have in your .mergemasterrc (PRESERVE_FILES=yes). Doug -- This .signature sanitized for your protection