From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 19:18:52 2015
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C491A4BB
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:18:52 +0000 (UTC)
Received: from mailgate.leissner.se (mailgate.leissner.se [212.3.1.210])
 by mx1.freebsd.org (Postfix) with ESMTP id 50FF7FAD
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:18:51 +0000 (UTC)
Received: from mailgate.leissner.se (localhost [127.0.0.1])
 by mailgate.leissner.se (8.14.9/8.14.9) with ESMTP id t2AJInd0029127
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 20:18:49 +0100 (CET)
 (envelope-from list-freebsd-stable@jyborn.se)
Received: (from uucp@localhost)
 by mailgate.leissner.se (8.14.9/8.14.9/Submit) id t2AJInAa029126
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 20:18:49 +0100 (CET)
 (envelope-from list-freebsd-stable@jyborn.se)
Received: from pol.leissner.se(192.71.29.17),
 claiming to be "pol-server.leissner.se"
 via SMTP by mailgate.leissner.se, id smtpdaMfLrL; Tue Mar 10 20:18:49 2015
Received: from localhost (2968@localhost [local]);
 by localhost (OpenSMTPD) with ESMTPA id 21732571;
 Tue, 10 Mar 2015 20:18:49 +0100 (CET)
Date: Tue, 10 Mar 2015 20:18:49 +0100
From: Peter Olsson <list-freebsd-stable@jyborn.se>
To: Chris H <bsd-lists@bsdforge.com>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
Message-ID: <20150310191849.GI9442@pol-server.leissner.se>
References: <20150310120540.GN8223@pol-server.leissner.se>
 <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com>
 <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: Adam Vande More <amvandemore@gmail.com>,
 "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Mar 2015 19:18:52 -0000

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@gmail.com>
> wrote
> 
> > On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson <list-freebsd-stable@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