From owner-freebsd-stable@FreeBSD.ORG Mon May 4 21:32:06 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 E798C106564A for ; Mon, 4 May 2009 21:32:06 +0000 (UTC) (envelope-from vince@unsane.co.uk) Received: from unsane.co.uk (unsane-pt.tunnel.tserv5.lon1.ipv6.he.net [IPv6:2001:470:1f08:110::2]) by mx1.freebsd.org (Postfix) with ESMTP id 541A08FC08 for ; Mon, 4 May 2009 21:32:06 +0000 (UTC) (envelope-from vince@unsane.co.uk) Received: from vhoffman-macbook.local ([IPv6:2001:470:9099:0:214:51ff:feed:712d]) (authenticated bits=0) by unsane.co.uk (8.14.3/8.14.0) with ESMTP id n44LX0Qu067074 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Mon, 4 May 2009 22:33:01 +0100 (BST) (envelope-from vince@unsane.co.uk) Message-ID: <49FF5D9C.5060409@unsane.co.uk> Date: Mon, 04 May 2009 22:26:52 +0100 From: Vincent Hoffman User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-GB; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Torfinn Ingolfsen References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> In-Reply-To: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> X-Enigmail-Version: 0.96a 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2009 21:32:07 -0000 On 4/5/09 21:50, 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. > > As part of that process I did (as I always do) 'mergemaster -iU' after > the 'make installworld' step. > A few files on my machines are modified by me, and thus should nevber > be upgraded: > /etc/dhclient.conf > /etc/motd (mergemeaster will usually ask about this - this time it did > not, it claimed it wasn't user modified, huh?) > /etc/profile > /root/.profile > /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still > upgraded, ugh!) > /etc/group (mergemaster sked about it, I pressed 'd', but it was still > upgraded, ugh!) > > It can be more files, I haven't found out yet. > > Has anyone else seen this? > > I am upgrading my next machine, this time I'll have backups and keep > better notes. > Not that its a cure but are master.passwd and group backups in /var/backups any help to you in this case? Vince