From owner-freebsd-questions@FreeBSD.ORG Mon Jan 1 13:34:22 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1818416A407 for ; Mon, 1 Jan 2007 13:34:22 +0000 (UTC) (envelope-from freebsd-questions-local@be-well.ilk.org) Received: from mail1.sea5.speakeasy.net (mail1.sea5.speakeasy.net [69.17.117.3]) by mx1.freebsd.org (Postfix) with ESMTP id E858B13C457 for ; Mon, 1 Jan 2007 13:34:21 +0000 (UTC) (envelope-from freebsd-questions-local@be-well.ilk.org) Received: (qmail 25588 invoked from network); 1 Jan 2007 13:34:21 -0000 Received: from dsl092-078-145.bos1.dsl.speakeasy.net (HELO be-well.ilk.org) ([66.92.78.145]) (envelope-sender ) by mail1.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 1 Jan 2007 13:34:21 -0000 Received: from Lowell-Desk.localdomain (Lowell-Desk.lan [172.30.250.10]) by be-well.ilk.org (Postfix) with ESMTP id CD4FF2842E; Mon, 1 Jan 2007 08:34:16 -0500 (EST) Received: by Lowell-Desk.localdomain (Postfix, from userid 1147) id 2C0571CE97; Mon, 1 Jan 2007 08:34:16 -0500 (EST) To: Dan Casey References: <45953BF3.5020705@debtresolve.com> From: Lowell Gilbert Date: Mon, 01 Jan 2007 08:34:16 -0500 In-Reply-To: <45953BF3.5020705@debtresolve.com> (Dan Casey's message of "Fri, 29 Dec 2006 11:01:55 -0500") Message-ID: <4464bqc1lz.fsf@Lowell-Desk.lan> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster and vimdiff X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-questions@freebsd.org List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jan 2007 13:34:22 -0000 Dan Casey writes: > Is there anyway to use vimdiff with mergemaster. Not easily; the diff(1) command is hard-wired into the mergemaster script. However, you could do your own comparison with MM_EXIT_SCRIPT. Also, remember that mergemaster is just a shell script itself, and you can use it as a base for your own version. > Or is it safe to just see what files are different in etc, and vimdiff > them manually? It's safe, but not necessarily easy. mergemaster is a lot easier than doing it by hand. Before mergemaster was added to the system, I used this script: http://Be-Well.Ilk.Org/~lowell/systuff/scripts/update-etc and then diff'd by hand. Are you aware of the '-a' option for mergemaster? That will leave you with a tree that contains only the files that mergemaster thinks need a human to look at... > I see /var/tmp/temproot has a lot more in it that I was > expecting. I thought it would be just etc. Most of that is directories without files, though; *almost* everything that can actually be changed is in /etc.