On Tue, 11 Aug 2009, p...@pair.com wrote:
in message <1249971512.63923.1045.ca...@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
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"

Reply via email to