From owner-freebsd-questions@FreeBSD.ORG Tue Aug 11 14:50:50 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 8801C1065673 for ; Tue, 11 Aug 2009 14:50:50 +0000 (UTC) (envelope-from prvs=4679686f8=pschmehl_lists@tx.rr.com) Received: from ip-relay-001.utdallas.edu (ip-relay-001.utdallas.edu [129.110.20.111]) by mx1.freebsd.org (Postfix) with ESMTP id 580788FC15 for ; Tue, 11 Aug 2009 14:50:49 +0000 (UTC) X-Group: RELAYLIST X-IronPort-AV: E=Sophos;i="4.43,360,1246856400"; d="scan'208";a="16103995" Received: from smtp3.utdallas.edu ([129.110.20.110]) by ip-relay-001.utdallas.edu with ESMTP; 11 Aug 2009 09:39:34 -0500 Received: from utd65257.utdallas.edu (utd65257.utdallas.edu [129.110.3.28]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp3.utdallas.edu (Postfix) with ESMTPSA id 4A1584E94D; Tue, 11 Aug 2009 09:39:34 -0500 (CDT) Date: Tue, 11 Aug 2009 14:39:34 +0000 From: Paul Schmehl To: Wayne Sierke , mahlerrd@yahoo.com Message-ID: In-Reply-To: <1249971512.63923.1045.camel@predator-ii.buffyverse> References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse> X-Mailer: Mulberry/4.0.6 (Linux/x86) X-Munged-Reply-To: Figure it out MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 Reply-To: Paul Schmehl List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2009 14:50:50 -0000 --On Tuesday, August 11, 2009 01:18:32 -0500 Wayne Sierke wrote: > > 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!" > That's one way to do it. Another is to use /etc/mergemaster.rc. Here's mine: # less /etc/mergemaster.rc # Automatically install files that do not exist AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace DIFF_FLAG="'.Bub'" # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' I never have issues with mergemaster because of this file. -- Paul Schmehl, Senior Infosec Analyst As if it wasn't already obvious, my opinions are my own and not those of my employer. ******************************************* "It is as useless to argue with those who have renounced the use of reason as to administer medication to the dead." Thomas Jefferson