From owner-freebsd-stable@FreeBSD.ORG Mon May 4 21:07:17 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 6699E1065673 for ; Mon, 4 May 2009 21:07:17 +0000 (UTC) (envelope-from sonic2000gr@gmail.com) Received: from mail-ew0-f171.google.com (mail-ew0-f171.google.com [209.85.219.171]) by mx1.freebsd.org (Postfix) with ESMTP id B74D88FC1E for ; Mon, 4 May 2009 21:07:16 +0000 (UTC) (envelope-from sonic2000gr@gmail.com) Received: by ewy19 with SMTP id 19so4172615ewy.43 for ; Mon, 04 May 2009 14:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=4n9sGiaXP/DApEN/YVrTtJ2AEMcLyT6f9DVuIaNTjKw=; b=YFwO3HDPNjDUeMV2lmUCUIgTRu3sOheS/pRIC2KvmvNsCPX1BIbN14f1VT/vPR7tG2 gIePRCK9HFUfVYZNBh5DUJ2yCQ+NzzZ+n3MnvumL4iJrOhHhtTpE3cSLaAQWazigZyUN T2V8g3f+4a84WCL/ogMIaZWas6gJpNeZWrv70= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=eCMzJo5x4e5ugOuJ4aX2+hOOR2sTvSyDmMOaWdfNDbAyjdiL9AnPoB2GXa14kDEDmT gwQDtkbjZkskZXiErIk2hTdR2H0X5RupVZ0pfuGfG3MWuKKUR/Dq0SujnLTPPduxwizZ cZowDIn2C+gWQotUPm+18HhOQpv7gyXGcujm4= Received: by 10.216.20.74 with SMTP id o52mr1965500weo.147.1241471235512; Mon, 04 May 2009 14:07:15 -0700 (PDT) Received: from atlantis.dyndns.org (athedsl-4471802.home.otenet.gr [94.71.123.234]) by mx.google.com with ESMTPS id 28sm174631eyg.58.2009.05.04.14.07.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 04 May 2009 14:07:14 -0700 (PDT) Message-ID: <49FF5901.600@gmail.com> Date: Tue, 05 May 2009 00:07:13 +0300 From: Manolis Kiagias User-Agent: Thunderbird 2.0.0.21 (X11/20090414) MIME-Version: 1.0 To: Torfinn Ingolfsen References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> In-Reply-To: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> 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:07:20 -0000 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. > I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem.