From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 17:59:51 2015
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 47082A42
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 17:59:51 +0000 (UTC)
Received: from mailgate.leissner.se (mailgate.leissner.se [212.3.1.210])
 by mx1.freebsd.org (Postfix) with ESMTP id C6E7A6AA
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 17:59:50 +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 t2AHxnNL027328
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 18:59: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 t2AHxnr4027327
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 18:59: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 smtpdySIUux; Tue Mar 10 18:59:46 2015
Received: from localhost (2968@localhost [local]);
 by localhost (OpenSMTPD) with ESMTPA id eb609ca0;
 Tue, 10 Mar 2015 18:59:46 +0100 (CET)
Date: Tue, 10 Mar 2015 18:59:46 +0100
From: Peter Olsson <list-freebsd-stable@jyborn.se>
To: Adam Vande More <amvandemore@gmail.com>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
Message-ID: <20150310175946.GD9442@pol-server.leissner.se>
References: <20150310120540.GN8223@pol-server.leissner.se>
 <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com>
 <20150310174554.GB9442@pol-server.leissner.se>
 <CA+tpaK3Deg0sVdhGX_RLDDdYKL3L38kt9yd1__eVoW=yKSOuJQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+tpaK3Deg0sVdhGX_RLDDdYKL3L38kt9yd1__eVoW=yKSOuJQ@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: "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 17:59:51 -0000

On Tue, Mar 10, 2015 at 12:55:09PM -0500, Adam Vande More wrote:
> On Tue, Mar 10, 2015 at 12:45 PM, Peter Olsson <
> list-freebsd-stable@jyborn.se> wrote:
> 
> > On Tue, Mar 10, 2015 at 10:17:18AM -0500, Adam Vande More 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.
> > >
> > > --
> > > Adam
> >
> > This seems like an excellent addition fo freebsd-update,
> > how come it isn't added?
> >
> 
> It is added, no flag needed.  You are running a version of freebsd-update
> which didn't have the feature(8.4).
> 
> -- 
> Adam

Ok, I see, thanks!

Peter Olsson