Date: Tue, 15 Nov 2016 16:15:58 -0600 From: CyberLeo Kitsana <cyberleo@cyberleo.net> To: Chris Stankevitz <chris@stankevitz.com>, FreeBSD Questions <freebsd-questions@freebsd.org> Subject: Re: Building world vs freebsd-update: merging files Message-ID: <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net> In-Reply-To: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com> References: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6b6b7079-9cb1-da69-3099-2e418123f8ea>