From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 19:18:43 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 5FADE3CC
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:18:43 +0000 (UTC)
Received: from udns.ultimatedns.net (unknown
 [IPv6:2602:d1:b4d6:e600:4261:86ff:fef6:aa2a])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 24530FA7
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:18:43 +0000 (UTC)
Received: from ultimatedns.net (localhost [127.0.0.1])
 by udns.ultimatedns.net (8.14.9/8.14.9) with ESMTP id t2AJKGWY002478;
 Tue, 10 Mar 2015 12:20:16 -0700 (PDT)
 (envelope-from bsd-lists@bsdforge.com)
To: Adam Vande More <amvandemore@gmail.com>
In-Reply-To: <CA+tpaK2dhYXzC+im=axcqbeutT8W6BZOWObzGCBX3LsrxKVvYA@mail.gmail.com>
References: <20150310120540.GN8223@pol-server.leissner.se>
 <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com>
 <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>,
 <CA+tpaK2dhYXzC+im=axcqbeutT8W6BZOWObzGCBX3LsrxKVvYA@mail.gmail.com>
From: "Chris H" <bsd-lists@bsdforge.com>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
Date: Tue, 10 Mar 2015 12:20:16 -0700
Content-Type: text/plain; charset=UTF-8; format=fixed
MIME-Version: 1.0
Message-id: <ff88caff820fcf67f3d13355dabd5073@ultimatedns.net>
Content-Transfer-Encoding: 8bit
Cc: "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org>,
 Peter Olsson <list-freebsd-stable@jyborn.se>
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:43 -0000

On Tue, 10 Mar 2015 14:08:21 -0500 Adam Vande More <amvandemore@gmail.com>
wrote

> On Tue, Mar 10, 2015 at 2:01 PM, Chris H <bsd-lists@bsdforge.com> wrote:
> 
> > > >
> > >
> > > 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."
> >
> 
> Op asked for a freebsd-update solution which excludes any mergemaster
> solution short of at least a partial rewrite.
Ahem... right you are! Speaking of reading things, it'd
kill me to read more closely, before replying. :P
Sorry, Adam.

--Chris
> 
> -- 
> Adam
> _______________________________________________
> freebsd-stable@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org"