Date: Tue, 05 May 2009 14:33:53 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Cristiano Deana <cristiano.deana@gmail.com> Cc: FreeBSD Stable Mailing List <freebsd-stable@freebsd.org> Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <4A00B0C1.4060009@FreeBSD.org> In-Reply-To: <d8a4930a0905051034k1c9b6d2id72663457c6b8a1c@mail.gmail.com> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <d8a4930a0905051034k1c9b6d2id72663457c6b8a1c@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Cristiano Deana wrote:
> On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen
> <torfinn.ingolfsen@broadpark.no> wrote:
>
>> I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as
>> of today, using csup and building world.
>
> i upgraded fw machines from _7_1 to _7_2. no problem at all here.
> did mergemaster is changed from -RELEASE to -STABLE?
The last change was before the 7.2-release cycle started (6 weeks ago).
> hint:
> use always -P option
I agree, it's a good thing to have in your .mergemasterrc
(PRESERVE_FILES=yes).
Doug
--
This .signature sanitized for your protection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A00B0C1.4060009>