From owner-freebsd-questions@FreeBSD.ORG Tue Aug 11 14:18:22 2009 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9054F1065670 for ; Tue, 11 Aug 2009 14:18:22 +0000 (UTC) (envelope-from parv@pair.com) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.125]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0E58FC3F for ; Tue, 11 Aug 2009 14:18:22 +0000 (UTC) Received: from localhost.hawaii.res.rr.com ([98.150.187.245]) by hrndva-omta02.mail.rr.com with ESMTP id <20090811141821366.SSUW15589@hrndva-omta02.mail.rr.com>; Tue, 11 Aug 2009 14:18:21 +0000 Received: from holstein.holy.cow (localhost [127.0.0.1]) by localhost.hawaii.res.rr.com (Postfix) with ESMTP id 2F10633CD; Tue, 11 Aug 2009 04:20:27 -1000 (HST) Received: (from parv@localhost) by holstein.holy.cow (8.13.8/8.13.8/Submit) id n7BEKQLX003582; Tue, 11 Aug 2009 04:20:26 -1000 (HST) (envelope-from parv@pair.com) X-Authentication-Warning: holstein.holy.cow: parv set sender to parv@pair.com using -f Date: Tue, 11 Aug 2009 04:20:26 -1000 From: parv@pair.com To: Wayne Sierke Message-ID: <20090811142026.GA3283@holstein.holy.cow> Mail-Followup-To: Wayne Sierke , mahlerrd@yahoo.com, FreeBSD-Questions References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1249971512.63923.1045.camel@predator-ii.buffyverse> Cc: FreeBSD-Questions , mahlerrd@yahoo.com Subject: Re: Don't let mergemaster beat you down [was Re: Failed update] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2009 14:18:22 -0000 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-, 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!". - Parv --