RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

[Doug Barton]

Cristiano Deana wrote:
> On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen
> <torfinn.ingolfsen at 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