From owner-freebsd-stable@FreeBSD.ORG Thu May 7 07:56: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 99D2B1065678; Thu, 7 May 2009 07:56:03 +0000 (UTC) (envelope-from ma@dt.e-technik.tu-dortmund.de) Received: from unimail.uni-dortmund.de (mx1.HRZ.Uni-Dortmund.DE [129.217.128.51]) by mx1.freebsd.org (Postfix) with ESMTP id 1C7A48FC23; Thu, 7 May 2009 07:56:02 +0000 (UTC) (envelope-from ma@dt.e-technik.tu-dortmund.de) Received: from merlin.emma.line.org (g226231102.adsl.alicedsl.de [92.226.231.102]) (authenticated bits=0) by unimail.uni-dortmund.de (8.14.3/8.14.3) with ESMTP id n477eqPN016912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 7 May 2009 09:41:06 +0200 (CEST) Date: Thu, 07 May 2009 09:40:52 +0200 To: "Daniel Gerzo" , "Manolis Kiagias" From: "Matthias Andree" Content-Type: text/plain; format=flowed; delsp=yes; charset=utf-8 MIME-Version: 1.0 References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> Content-Transfer-Encoding: 7bit Organization: Message-ID: In-Reply-To: <49FFEECE.20403@FreeBSD.org> User-Agent: Opera Mail/9.64 (Linux) 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: Thu, 07 May 2009 07:56:03 -0000 Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo : > 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. Careful there - RELENG_7 is _newer_ than RELENG_7_2. The latter is branched off RELENG_7 at some point and progresses much slower (as in: errata and security, but no development), so that's no "update", but often the reverse. -- Matthias Andree