From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 19:08:23 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 04F47F2E
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:08:23 +0000 (UTC)
Received: from mail-pd0-x22d.google.com (mail-pd0-x22d.google.com
 [IPv6:2607:f8b0:400e:c02::22d])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C2DF4E9A
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:08:22 +0000 (UTC)
Received: by pdjy10 with SMTP id y10so4413151pdj.12
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 12:08:22 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=BYqFqSzfKOU18iYnKujpU2dyNurJV7zwgw3HwtormiU=;
 b=O4XRcNiQVVh4p6c4XqH4mAfeG41a8nWuqpzdZ+kYeAssG6wPaDnttqoY3V30xpAXQ+
 z4WJOvNuiCuH2gDeMxB3CSvdlLwf4iTs+/mq5GpeZVnKIAPwtED+PZ4hNGy0JCloqMC5
 P8caacPB+IUel3ZN1DmzrUM2cSWOeYBEo2IqCtiGWSpPzLIjuUyGX/GcnLKHHnp91vuS
 Xy6bYpLEShQ5QejNSOGdBLVoky6qJnxMZG6g0n9sEww2pKLVszApZNUaQ8hok4Fm/XVs
 FirR094GK9Ao+66C4xmXLbACYG1Jr6i0lhzvh6W6gMHIZs58Kzhm5tP701FDMSFpZaj9
 lnBw==
MIME-Version: 1.0
X-Received: by 10.66.63.106 with SMTP id f10mr69541940pas.0.1426014501259;
 Tue, 10 Mar 2015 12:08:21 -0700 (PDT)
Received: by 10.70.79.166 with HTTP; Tue, 10 Mar 2015 12:08:21 -0700 (PDT)
In-Reply-To: <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
References: <20150310120540.GN8223@pol-server.leissner.se>
 <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com>
 <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
Date: Tue, 10 Mar 2015 14:08:21 -0500
Message-ID: <CA+tpaK2dhYXzC+im=axcqbeutT8W6BZOWObzGCBX3LsrxKVvYA@mail.gmail.com>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
From: Adam Vande More <amvandemore@gmail.com>
To: Chris H <bsd-lists@bsdforge.com>
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
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:08:23 -0000

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.

-- 
Adam