From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 19:00:21 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 3C961CFA
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:00:21 +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 102DADB3
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 19:00:20 +0000 (UTC)
Received: from ultimatedns.net (localhost [127.0.0.1])
 by udns.ultimatedns.net (8.14.9/8.14.9) with ESMTP id t2AJ1s01001255;
 Tue, 10 Mar 2015 12:01:54 -0700 (PDT)
 (envelope-from bsd-lists@bsdforge.com)
To: Peter Olsson <list-freebsd-stable@jyborn.se>, Adam Vande More
 <amvandemore@gmail.com>
In-Reply-To: <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com>
References: <20150310120540.GN8223@pol-server.leissner.se>,
 <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@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:01:54 -0700
Content-Type: text/plain; charset=UTF-8; format=fixed
MIME-Version: 1.0
Message-id: <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
Content-Transfer-Encoding: 8bit
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 19:00:21 -0000

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. ;-)

--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"