From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 14:46:46 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 3C7B3F22
 for <freebsd-stable@FreeBSD.org>; Tue, 10 Mar 2015 14:46:46 +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 0265986C
 for <freebsd-stable@FreeBSD.org>; Tue, 10 Mar 2015 14:46:45 +0000 (UTC)
Received: from ultimatedns.net (localhost [127.0.0.1])
 by udns.ultimatedns.net (8.14.9/8.14.9) with ESMTP id t2AEmJlm083837;
 Tue, 10 Mar 2015 07:48:19 -0700 (PDT)
 (envelope-from bsd-lists@bsdforge.com)
To: freebsd-stable@FreeBSD.org, Peter Olsson <list-freebsd-stable@jyborn.se>
In-Reply-To: <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>
References: <20150310120540.GN8223@pol-server.leissner.se>,
 <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>
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 07:48:19 -0700
Content-Type: text/plain; charset=UTF-8; format=fixed
MIME-Version: 1.0
Message-id: <71c86834a9514c94c7ab74bff91a679d@ultimatedns.net>
Content-Transfer-Encoding: 8bit
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 14:46:46 -0000

On Tue, 10 Mar 2015 06:58:07 -0700 "Chris H" <bsd-lists@bsdforge.com> wrote

> On Tue, 10 Mar 2015 13:05:40 +0100 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:
> > "
> > # 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?
> Hello, Peter.
> This has probably been answered by now. But just in case.
> I believe what you're looking for is:
> mergemaster -vF
> 
> This is my [chosen] default. I also find it helpful,
> as a "safety net" to
> cp _Rp /etc /eetc
Ahem... On the off chance it wasn't obvious.
The above line /should/ have read
cp -Rp /etc /eetc
___^

Sorry.

--Chris
> 
> prior to the mergemaster(8) step.
> 
> On a related note. I'm not very fond of mergemaster. As
> a result, I recently took on maintaining
> sysutils/etcmerge. sysutils/etcupdate, is also a
> [mergemaster] related port.
> 
> Hope this helps.
> 
> --Chris
> > 
> > I just did my first major upgrade (8.4-RELEASE-p24 ->
> > 9.3-RELEASE-p10) with freebsd-update. It took more than
..
> > 
> > -- 
> > Peter Olsson
> > _______________________________________________
> > 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"
> 
> 
> _______________________________________________
> 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"