From owner-freebsd-stable@FreeBSD.ORG Tue May 5 08:01:33 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 5B2571065672 for ; Tue, 5 May 2009 08:01:33 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from services.rulez.sk (services.rulez.sk [92.240.234.125]) by mx1.freebsd.org (Postfix) with ESMTP id 1275A8FC15 for ; Tue, 5 May 2009 08:01:32 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from localhost (services.rulez.sk [92.240.234.125]) by services.rulez.sk (Postfix) with ESMTP id 6C8EA133447A; Tue, 5 May 2009 09:46:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at rulez.sk Received: from services.rulez.sk ([92.240.234.125]) by localhost (services.rulez.sk [92.240.234.125]) (amavisd-new, port 10024) with ESMTP id 6+wWJD+mqOwU; Tue, 5 May 2009 09:46:31 +0200 (CEST) Received: from [10.50.0.2] (danger.mcrn.sk [84.16.37.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: danger@rulez.sk) by services.rulez.sk (Postfix) with ESMTPSA id 8EA981334421; Tue, 5 May 2009 09:46:31 +0200 (CEST) Message-ID: <49FFEECE.20403@FreeBSD.org> Date: Tue, 05 May 2009 09:46:22 +0200 From: Daniel Gerzo Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: Manolis Kiagias References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> In-Reply-To: <49FF5901.600@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed 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 08:01:33 -0000 Manolis Kiagias wrote: > 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. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, master.passwd, group, sysctl.conf motd and maybe some more got overwritten :-( I had to restore from backups. -- S pozdravom / Best regards Daniel Gerzo, FreeBSD committer