Date: Tue, 11 Aug 2009 15:48:32 +0930 From: Wayne Sierke <ws@au.dyndns.ws> To: mahlerrd@yahoo.com Cc: FreeBSD-Questions <freebsd-questions@freebsd.org> Subject: Don't let mergemaster beat you down [was Re: Failed update] Message-ID: <1249971512.63923.1045.camel@predator-ii.buffyverse> In-Reply-To: <526027.78512.qm@web51009.mail.re2.yahoo.com> References: <526027.78512.qm@web51009.mail.re2.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
"Try it - you'll like it!"
Wayne
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1249971512.63923.1045.camel>