From owner-freebsd-questions@FreeBSD.ORG Tue Aug 11 14:52:39 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 1896A106566C for ; Tue, 11 Aug 2009 14:52:39 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id CC7B58FC43 for ; Tue, 11 Aug 2009 14:52:38 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.3/8.14.3) with ESMTP id n7BEqa7P017412; Tue, 11 Aug 2009 08:52:36 -0600 (MDT) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.3/8.14.3/Submit) with ESMTP id n7BEqaQA017409; Tue, 11 Aug 2009 08:52:36 -0600 (MDT) (envelope-from wblock@wonkity.com) Date: Tue, 11 Aug 2009 08:52:36 -0600 (MDT) From: Warren Block To: parv@pair.com In-Reply-To: <20090811142026.GA3283@holstein.holy.cow> Message-ID: References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse> <20090811142026.GA3283@holstein.holy.cow> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (wonkity.com [127.0.0.1]); Tue, 11 Aug 2009 08:52:36 -0600 (MDT) Cc: FreeBSD-Questions 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:52:39 -0000 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-, 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