From owner-freebsd-stable@FreeBSD.ORG Mon May 4 20:51:03 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 8957210656AC for ; Mon, 4 May 2009 20:51:03 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.freebsd.org (Postfix) with ESMTP id 4AD088FC15 for ; Mon, 4 May 2009 20:51:03 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0KJ500ALU0JPO820@osl1smout1.broadpark.no> for freebsd-stable@freebsd.org; Mon, 04 May 2009 22:50:13 +0200 (CEST) Received: from kg-v2.kg4.no ([80.202.83.38]) by osl1sminn1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with SMTP id <0KJ500DY80JOEJB0@osl1sminn1.broadpark.no> for freebsd-stable@freebsd.org; Mon, 04 May 2009 22:50:13 +0200 (CEST) Date: Mon, 04 May 2009 22:50:12 +0200 From: Torfinn Ingolfsen To: freebsd-stable@freebsd.org Message-id: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; amd64-portbld-freebsd7.2) X-Face: "t9w2,-X@O^I`jVW\sonI3.,36KBLZE*AL[y9lL[PyFD*r_S:dIL9c[8Y>V42R0"!"yb_zN,f#%.[PYYNq; m"_0v; ~rUM2Yy!zmkh)3&U|u!=T(zyv,MHJv"nDH>OJ`t(@mil461d_B'Uo|'nMwlKe0Mv=kvV?Nh@>Hb<3s_z2jYgZhPb@?Wi^x1a~Hplz1.zH Subject: 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 20:51:03 -0000 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. -- Regards, Torfinn Ingolfsen