Building world vs freebsd-update: merging files

[Chris Stankevitz]

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.