Date: Tue, 11 Aug 2009 14:23:28 +0100 From: Arthur Chance <freebsd@qeng-ho.org> To: FreeBSD-Questions <freebsd-questions@freebsd.org> Subject: Re: Don't let mergemaster beat you down [was Re: Failed update] Message-ID: <4A8170D0.8030709@qeng-ho.org> In-Reply-To: <1249971512.63923.1045.camel@predator-ii.buffyverse> References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse>
next in thread | previous in thread | raw e-mail | index | archive | help
Wayne Sierke wrote: > I lost practically all of my 'mergemaster pain' when I adopted the habit > of using it with -iUP options: > > -i Automatically install any files that do not exist in the des- > tination directory. > -P Preserve files that you replace in > /var/tmp/mergemaster/preserved-files-<date>, or another > directory you specify in your mergemaster rc file. > -U Attempt to auto upgrade files that have not been user modi- > fied. How does -U compare to -F? I've found that saves a lot of tedium.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A8170D0.8030709>