From owner-freebsd-stable@FreeBSD.ORG Tue May 5 23:40:14 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 BD05010656D1; Tue, 5 May 2009 23:40:14 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (brucec-1-pt.tunnel.tserv4.nyc4.ipv6.he.net [IPv6:2001:470:1f06:c09::2]) by mx1.freebsd.org (Postfix) with ESMTP id 799EF8FC08; Tue, 5 May 2009 23:40:14 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id 8C5D819011; Wed, 6 May 2009 00:40:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on muon X-Spam-Level: X-Spam-Status: No, score=-2.6 required=8.0 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.2.5 Received: from gluon.draftnet (unknown [IPv6:2a01:348:10f:0:240:f4ff:fe57:9871]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA; Wed, 6 May 2009 00:40:18 +0000 (GMT) Date: Wed, 6 May 2009 00:40:09 +0100 From: Bruce Cran To: Doug Barton Message-ID: <20090506004009.12729c32@gluon.draftnet> In-Reply-To: <4A00AF76.8010604@FreeBSD.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <4A00AF76.8010604@FreeBSD.org> X-Mailer: Claws Mail 3.7.1 (GTK+ 2.16.1; i386-portbld-freebsd7.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Torfinn Ingolfsen , 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2009 23:40:15 -0000 On Tue, 05 May 2009 14:28:22 -0700 Doug Barton wrote: > Torfinn Ingolfsen wrote: > > Ok, this is strange. > > > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable > > as of today, using csup and building world. > > I've read this thread and find the whole thing very odd. In particular > regarding your case, the last change to mergemaster was done on March > 23rd, so if you updated a system on April 1st then again on May 4th > you should have been using the same version of mergemaster. There was a recent thread on -questions about this issue too, with the title "mergemaster -U overwriting modified files". I've seen mergemaster clobber named.conf but I've failed to repeat it despite changing the revision, file timestamp etc. -- Bruce Cran