On Tue, Feb 13, 2001 at 01:26:39PM -0800, Brian Behlendorf wrote:
> On Tue, 13 Feb 2001, Kris Kennaway wrote:
> > On Tue, Feb 13, 2001 at 08:10:19AM -0800, Brian Behlendorf wrote:
> > > I have to agree - many of the changes mergemaster makes are to files that
> > > no one would recommend editing directly in regular use, like MAKEDEV and
> > > /etc/rc.network and all the stuff in /etc/defaults. Modifying mergemaster
> > > to only ask to merge files that have been changed sounds like a good idea
> > > to me...
> >
> > Have you read the mergemaster docs? It can already do this.
>
> Er, how? You mean the MM_PRE_COMPARE_SCRIPT and MM_EXIT_SCRIPT script
> hooks? It's been a long week and is only Tuesday, but I must be missing
> something...
Actually, I think I was wrong (I was thinking of the option to merge
based on diffs). Still, talk to Doug about the suggestion.
Kris
PGP signature
