RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

[Doug Barton]

Torfinn Ingolfsen wrote:
> On Sat, 16 May 2009 16:13:12 -0700
> Doug Barton <dougb at freebsd.org> wrote:
> 
>> You should be able to grab the file from HEAD and run it on
>> RELENG_[67] without any problems. I will MFC it as rapidly as
>> possible.
> 
> FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to
> 7.2-stable (csup'ed today). For the mergemaster steps in the "make
> world" procedure, I used
> 
> /usr/src/usr/sbin/mergemaster/mergemaster.sh
> 
> instead of just mergemaster.
> 
> Worked like a charm. Thanks!

Good news, thanks!


Doug

-- 

    This .signature sanitized for your protection