From owner-freebsd-stable@FreeBSD.ORG Thu May 7 13:46:09 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 8C91E106566C for ; Thu, 7 May 2009 13:46:09 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from hosting.cia.sk (hosting.cia.sk [92.240.234.123]) by mx1.freebsd.org (Postfix) with ESMTP id 10B108FC08 for ; Thu, 7 May 2009 13:46:08 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from hosting.cia.sk (hosting.cia.sk [92.240.234.123]) by hosting.cia.sk (8.14.3/8.14.3) with ESMTP id n47D9Vg6013192; Thu, 7 May 2009 15:09:31 +0200 (CEST) (envelope-from danger@FreeBSD.org) Received: (from www@localhost) by hosting.cia.sk (8.14.3/8.14.3/Submit) id n47D9Pp1013023; Thu, 7 May 2009 15:09:25 +0200 (CEST) (envelope-from danger@FreeBSD.org) X-Authentication-Warning: hosting.cia.sk: www set sender to danger@FreeBSD.org using -f To: Matthias Andree MIME-Version: 1.0 Date: Thu, 07 May 2009 15:09:25 +0200 From: Daniel Gerzo Organization: The FreeBSD Project In-Reply-To: References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> Message-ID: <62bf86e574316680f37efd872c1d361a@services.rulez.sk> X-Sender: danger@FreeBSD.org User-Agent: RoundCube Webmail/0.2a Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Cc: Torfinn Ingolfsen , freebsd-stable@FreeBSD.org, Manolis Kiagias 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 13:46:09 -0000 On Thu, 07 May 2009 09:40:52 +0200, "Matthias Andree" wrote: > 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. That's not definitely true all the time. You could for example update your 7.1 to releng_7, say in Sept. 2008, then run this box until releng_7_2 was branched and when you update to it at that point you actually are doing an update, definitely not a downgrade. -- Kind regards Daniel