Date: Tue, 11 Aug 2009 08:52:36 -0600 (MDT) From: Warren Block <wblock@wonkity.com> To: parv@pair.com Cc: FreeBSD-Questions <freebsd-questions@freebsd.org> Subject: Re: Don't let mergemaster beat you down [was Re: Failed update] Message-ID: <alpine.BSF.2.00.0908110850440.17388@wonkity.com> In-Reply-To: <20090811142026.GA3283@holstein.holy.cow> References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse> <20090811142026.GA3283@holstein.holy.cow>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 11 Aug 2009, parv@pair.com wrote: > in message <1249971512.63923.1045.camel@predator-ii.buffyverse>, > wrote Wayne Sierke thusly... >> >> On Sun, 2009-08-09 at 08:34 -0700, Richard Mahlerwein wrote: >>> I'm redoing the whole process in single user mode. My guess is >>> I goofed something during mergemaster and devd.conf is messed >>> up. (Mergemaster is, undeniably, my least favorite utility). >> >> 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. > > Ah. My mnemonic would be "PiU" as in "Pew! Pew!". I prefer phooey mode: -FUi. Still works with -PFUi. -Warren Block * Rapid City, South Dakota USA
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.0908110850440.17388>