From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 13:10:14 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 0537C12C
 for <freebsd-stable@FreeBSD.org>; Tue, 10 Mar 2015 13:10:14 +0000 (UTC)
Received: from home.opsec.eu (home.opsec.eu [IPv6:2001:14f8:200::1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B68C18EF
 for <freebsd-stable@FreeBSD.org>; Tue, 10 Mar 2015 13:10:13 +0000 (UTC)
Received: from pi by home.opsec.eu with local (Exim 4.82 (FreeBSD))
 (envelope-from <lists@opsec.eu>)
 id 1YVJvH-000LMP-92; Tue, 10 Mar 2015 14:10:11 +0100
Date: Tue, 10 Mar 2015 14:10:11 +0100
From: Kurt Jaeger <lists@opsec.eu>
To: Peter Olsson <list-freebsd-stable@jyborn.se>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
Message-ID: <20150310131011.GN62590@home.opsec.eu>
References: <20150310120540.GN8223@pol-server.leissner.se>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150310120540.GN8223@pol-server.leissner.se>
Cc: 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 13:10:14 -0000

Hi!

> 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:
> "
> # Install the new file if it differs only by VCS Id ($FreeBSD)
> FREEBSD_ID=yes
> "
> Is there some equivalent to this flag in freebsd-update/merge?
> 
> I just did my first major upgrade (8.4-RELEASE-p24 ->
> 9.3-RELEASE-p10) with freebsd-update. It took more than
> an hour of manual keyboard activity, most of which could
> probably be done automatically. (And here I thought that
> computers were supposed to free us from tedious routine
> work...)

Well, I've been through this in the past as well. If it helps,
it gets much better with more recent versions of FreeBSD (9.3 -> 10.x).

So, yes, it's a drag, but it will not repeat in future updates.

-- 
pi@opsec.eu            +49 171 3101372                         5 years to go !