From owner-freebsd-questions@FreeBSD.ORG Tue Aug 11 06:34:37 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 9AC191065672 for ; Tue, 11 Aug 2009 06:34:37 +0000 (UTC) (envelope-from ws@au.dyndns.ws) Received: from ipmail02.adl6.internode.on.net (ipmail02.adl6.internode.on.net [203.16.214.140]) by mx1.freebsd.org (Postfix) with ESMTP id 1CCF68FC21 for ; Tue, 11 Aug 2009 06:34:36 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApgBABeogEqWZWdv/2dsb2JhbAAI0GyEGQU X-IronPort-AV: E=Sophos;i="4.43,358,1246804200"; d="scan'208";a="16206374" Received: from ppp103-111.static.internode.on.net (HELO [192.168.1.144]) ([150.101.103.111]) by ipmail02.adl6.internode.on.net with ESMTP; 11 Aug 2009 15:48:35 +0930 From: Wayne Sierke To: mahlerrd@yahoo.com In-Reply-To: <526027.78512.qm@web51009.mail.re2.yahoo.com> References: <526027.78512.qm@web51009.mail.re2.yahoo.com> Content-Type: text/plain Date: Tue, 11 Aug 2009 15:48:32 +0930 Message-Id: <1249971512.63923.1045.camel@predator-ii.buffyverse> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: FreeBSD-Questions Subject: 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 06:34:37 -0000 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. "Try it - you'll like it!" Wayne