Building world vs freebsd-update: merging files
chris at stankevitz.com
Wed Nov 16 14:24:58 UTC 2016
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 , freebsd-update does indeed merge
Confusingly the handbook explicitly says that mergemaster is not used
but refers to mergemaster documentation for more info.
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.
More information about the freebsd-questions