There has to be a better way of merging /etc during a major freebsd-update

[Peter Olsson]

On Tue, Mar 10, 2015 at 12:01:54PM -0700, Chris H wrote:
> On Tue, 10 Mar 2015 10:17:18 -0500 Adam Vande More <amvandemore at gmail.com>
> wrote
> 
> > On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson <list-freebsd-stable at jyborn.se
> > > wrote:
> > 
> > > This flag to mergemaster saved a lot of work when I did
> > > upgrades the old way, with cvsup and the make steps and
> > > then mergemaster:
> > >
> > 
> > https://svnweb.freebsd.org/base?view=revision&revision=221780
> > 
> > I'd venture to guess the script will work fine on older installs, but
> > testing should be done first.
> Isn't that pretty much what the -F flag, I mentioned does?
> "-F    If the files differ only by VCS Id ($FreeBSD) install the
>        new file."
> In all honesty, I too got stuck answering "y" ~100 times, way
> back when. And decided I needed to either find a better way,
> or see if the mergemaster(8) had any secrets I wasn't
> aware of. ;-)

I think you are mixing up mergemaster with merge.
Freebsd-update uses merge, not mergemaster.
(But I will try running freebsd-update without merging /etc,
and use mergemaster -F instead. Should solve my problem.)

Peter Olsson