Date: Thu, 07 May 2009 15:09:25 +0200 From: Daniel Gerzo <danger@FreeBSD.org> To: Matthias Andree <ma@dt.e-technik.tu-dortmund.de> Cc: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no>, freebsd-stable@FreeBSD.org, Manolis Kiagias <sonic2000gr@gmail.com> Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <62bf86e574316680f37efd872c1d361a@services.rulez.sk> In-Reply-To: <op.utjt91lkt6kky0@merlin.emma.line.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> <op.utjt91lkt6kky0@merlin.emma.line.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 07 May 2009 09:40:52 +0200, "Matthias Andree" <ma@dt.e-technik.tu-dortmund.de> wrote: > Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo <danger@freebsd.org>: > >> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?62bf86e574316680f37efd872c1d361a>