Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Nov 2016 06:24:54 -0800
From:      Chris Stankevitz <>
To:        Jonathan Moore <>, "" <>
Subject:   Re: Building world vs freebsd-update: merging files
Message-ID:  <>
In-Reply-To: <>
References:  <>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
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
> 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.


[1] From

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.

Want to link to this message? Use this URL: <>