From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 15:17:19 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 A7FB92A7
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 15:17:19 +0000 (UTC)
Received: from mail-pd0-x22f.google.com (mail-pd0-x22f.google.com
 [IPv6:2607:f8b0:400e:c02::22f])
 (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 73537CD9
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 15:17:19 +0000 (UTC)
Received: by pdjy10 with SMTP id y10so2950324pdj.8
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 08:17:19 -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=pUwiA5G/PSeLbC0qM4TbLGXj8WjfpfQlv2T36gVpN4I=;
 b=jr2Nl/woSkC8O8+3Dq+LFqA4ATKmmwPAqntngMJd/ed3+p6W8qlo0B6K1WjDtKxZcQ
 6wB5SXLkXEp6pBP1CBKB1FuLEXYPEO5HIMP12J02OEpjdDhQm3KAeP3qbaMti5r9X/kG
 T69v0ZWv6Kgpgh+OKiBgxyjvLvXD9RMhphpwMIKVeRCGbNHBXSHPXTdeSweENWCFlxMp
 QSElJTvjt1I1KBFGwWEF+Ap9tH9QsaE+DFEKYD2MI9J6PjZ2f+zy+/u6fpvfxDzj5uD3
 bTvbucIkRrSZjNfBPtcOusLKeNEtt2G/wiWencJRx7Rnnu2r7rAi3GinFcsL+ThSrbo8
 gCHQ==
MIME-Version: 1.0
X-Received: by 10.66.159.138 with SMTP id xc10mr67258821pab.141.1426000638756; 
 Tue, 10 Mar 2015 08:17:18 -0700 (PDT)
Received: by 10.70.110.134 with HTTP; Tue, 10 Mar 2015 08:17:18 -0700 (PDT)
In-Reply-To: <20150310120540.GN8223@pol-server.leissner.se>
References: <20150310120540.GN8223@pol-server.leissner.se>
Date: Tue, 10 Mar 2015 10:17:18 -0500
Message-ID: <CA+tpaK2QWN4ez+jKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@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: Peter Olsson <list-freebsd-stable@jyborn.se>
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>
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 15:17:19 -0000

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.

-- 
Adam