RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

[Torfinn Ingolfsen]

On Tue, 05 May 2009 14:28:22 -0700
Doug Barton <dougb at FreeBSD.org> wrote:

> I've read this thread and find the whole thing very odd. In particular

I agree - it is odd.

I have a few more machines to upgrade in the coming weeks - if anyone
have a better testcase to find out what is going on, I'm ready for it.

> That shouldn't even be possible. You have to affirmatively choose 'i'
> (for install) for it to be installed at all, the default is to leave
> it in the temproot directory. Additionally, the code to handle
> deleting is some of the oldest code in the script, and hasn't changed
> in over 8 years.

Well, something has changed in the way mergemaster handles this, unless
there is something else in the make world procedure that updates files
in /etc?

To be clear, I follow this procedure:
1. make buildworld
2. make kernel
3. shutdown now
4. mergemaster -p
5. make installworld
6. mergemaster -iU
7. fastboot

> I saw your followup message, can you please do me a favor and modify
> your /etc/motd file again, then run the following in a script(1) and
> send me the log?   /bin/sh -x mergemaster -iU

Done - sent in personal mail.

HTH
-- 
Regards,
Torfinn Ingolfsen