From owner-freebsd-questions@FreeBSD.ORG Tue Aug 11 16:45:07 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 51FBB1065673 for ; Tue, 11 Aug 2009 16:45:07 +0000 (UTC) (envelope-from mel.flynn+fbsd.questions@mailing.thruhere.net) Received: from mailhub.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27]) by mx1.freebsd.org (Postfix) with ESMTP id 20B3A8FC15 for ; Tue, 11 Aug 2009 16:45:06 +0000 (UTC) Received: from smoochies.rachie.is-a-geek.net (mailhub.lan.rachie.is-a-geek.net [192.168.2.11]) by mailhub.rachie.is-a-geek.net (Postfix) with ESMTP id 5117C7E818; Tue, 11 Aug 2009 08:45:06 -0800 (AKDT) From: Mel Flynn To: freebsd-questions@freebsd.org Date: Tue, 11 Aug 2009 08:45:05 -0800 User-Agent: KMail/1.11.4 (FreeBSD/8.0-BETA2; KDE/4.2.4; i386; ; ) References: <526027.78512.qm@web51009.mail.re2.yahoo.com> <1249971512.63923.1045.camel@predator-ii.buffyverse> <4A8170D0.8030709@qeng-ho.org> In-Reply-To: <4A8170D0.8030709@qeng-ho.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200908110845.05423.mel.flynn+fbsd.questions@mailing.thruhere.net> Cc: Arthur Chance 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 16:45:07 -0000 On Tuesday 11 August 2009 05:23:28 Arthur Chance wrote: > Wayne Sierke wrote: > > 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. > > How does -U compare to -F? I've found that saves a lot of tedium. -U saves a lot on major version upgrades as that tends to have a lot of changes in /etc/rc.*, something most of us don't touch by hand. However, the feature depends on having a fingerprint of the files, so that mergemaster can determine if you changed the file. Before using the feature and before upgrading it's therefore recommended to do a dry run so that the file (/var/db/mergemaster.mtree) is created. -- Mel