From owner-freebsd-questions@freebsd.org  Tue Nov 15 22:23:20 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 5AB17C44142
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Tue, 15 Nov 2016 22:23:20 +0000 (UTC)
 (envelope-from cyberleo@cyberleo.net)
Received: from mail.cyberleo.net (paka.cyberleo.net [216.226.128.180])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FCC81C1D
 for <freebsd-questions@freebsd.org>; Tue, 15 Nov 2016 22:23:19 +0000 (UTC)
 (envelope-from cyberleo@cyberleo.net)
Received: from [172.16.44.4] (vitani.den.cyberleo.net [216.80.73.130])
 by mail.cyberleo.net (Postfix) with ESMTPSA id 6287049E3E;
 Tue, 15 Nov 2016 17:15:59 -0500 (EST)
Subject: Re: Building world vs freebsd-update: merging files
To: Chris Stankevitz <chris@stankevitz.com>,
 FreeBSD Questions <freebsd-questions@freebsd.org>
References: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com>
From: CyberLeo Kitsana <cyberleo@cyberleo.net>
Message-ID: <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net>
Date: Tue, 15 Nov 2016 16:15:58 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com>
Content-Type: text/plain; charset=windows-1252
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: Tue, 15 Nov 2016 22:23:20 -0000

On 11/15/2016 12:03 PM, Chris Stankevitz wrote:
> Hi,
> 
> When using mergemaster during buildworld/installworld, I am asked to
> merge many files.
> 
> When using freebsd-update, I am never asked to merge any files.
> 
> Why the discrepancy?

What flags do you pass to mergemaster while installing world?

I usually use mergemaster -iFU - the caveat being that this requires an
mtree database to be maintained for it to detect changes to files, and
this database is only built and maintained when you use the -U flag.

Presumably, freebsd-update does similar automatically, and that's why it
never asks. Or maybe it just overwrites your local changes? I've only
ever used installworld, and freebsd-update(8) doesn't mention anything
about locally modified files.

-- 
Fuzzy love,
-CyberLeo
Technical Administrator
CyberLeo.Net Webhosting
http://www.CyberLeo.Net
<CyberLeo@CyberLeo.Net>

Furry Peace! - http://www.fur.com/peace/