From owner-freebsd-questions@freebsd.org  Wed Nov 16 14:24:58 2016
Return-Path: <owner-freebsd-questions@freebsd.org>
Delivered-To: freebsd-questions@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C61B3C4578D
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Wed, 16 Nov 2016 14:24:58 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from mango.stankevitz.com (mango.stankevitz.com [208.79.93.194])
 by mx1.freebsd.org (Postfix) with ESMTP id B7BFCC57
 for <freebsd-questions@freebsd.org>; Wed, 16 Nov 2016 14:24:58 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from Chriss-MacBook-Pro.local
 (50-200-34-197-static.hfc.comcastbusiness.net [50.200.34.197])
 by mango.stankevitz.com (Postfix) with ESMTPSA id 385513C45B;
 Wed, 16 Nov 2016 06:24:57 -0800 (PST)
Subject: Re: Building world vs freebsd-update: merging files
To: Jonathan Moore <jdm7dv@outlook.com>,
 "freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org>
References: <MWHPR02MB2479A5B50FCA60F387EDC6489ABE0@MWHPR02MB2479.namprd02.prod.outlook.com>
From: Chris Stankevitz <chris@stankevitz.com>
Message-ID: <7955a263-ea42-e1bd-6813-7ba740ca7bee@stankevitz.com>
Date: Wed, 16 Nov 2016 06:24:54 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:45.0)
 Gecko/20100101 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: <MWHPR02MB2479A5B50FCA60F387EDC6489ABE0@MWHPR02MB2479.namprd02.prod.outlook.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Nov 2016 14:24:58 -0000

On 11/16/16 6:09 AM, Jonathan Moore wrote:
> Because merge master merges your confg files and update does not.
>
> Here is a quick and dirty build world
>
> http://hades.palmboys.nl/freebsd-updating.html
>
> Jonathan Moore


According to the handbook [1], freebsd-update does indeed merge 
configuration files:

Confusingly the handbook explicitly says that mergemaster is not used 
but refers to mergemaster documentation for more info.

Chris

[1] From 
https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-freebsdupdate.html:

The file merge process is a series of diff(1) patches similar to 
mergemaster(8), but with fewer options. Merges are either accepted, open 
an editor, or cause freebsd-update to abort. When in doubt, backup /etc 
and just accept the merges. See Section 23.6.4, “Merging Configuration 
Files” for more information about mergemaster.