A smarter mergemaster

[Yar Tikhiy]

On Fri, Sep 30, 2005 at 02:37:05PM -0700, Kevin Oberman wrote:
> 
> You just hit on one of my pet peeves with mergemaster! Contrary to what
> you say: "every single default for mergemaster is to do nothing", when a
> file is found in /etc/rc.d that is not in /usr/src/etc/rc.d, the default
> is to delete the file in etc. I think that this is a bad thing(tm). I
> have to restore my profile.sh (which MUST be in /etc/rc.d as it needs to
> be run before /usr is mounted).
> 
> I do have an open PR on this (conf/85449), but it does not seem to have
> gone anywhere other than being assigned to you last Friday. (No, I
> didn't expect anything to happen this quickly. You just gave me such a
> perfect opportunity to gripe!)

FWIW, I wondered if my version of mergemaster in p4 was affected
by this issue and found to my surprise that I had already addressed
it in my changes.

-- 
Yar