From owner-freebsd-questions  Wed Oct 17  3:18:16 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from mcclure.tinet.ie (mail1.tinet.ie [159.134.237.19])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6900A37B408; Wed, 17 Oct 2001 03:18:12 -0700 (PDT)
Received: from p438.as1.limerick1.eircom.net ([159.134.165.182] helo=dansat.data-plan.com)
	by mcclure.tinet.ie with esmtp (Exim 2.05 #23)
	id 15tnm4-0006pI-00; Wed, 17 Oct 2001 11:18:09 +0100
Received: (from timbo@localhost)
	by dansat.data-plan.com (8.11.6/8.11.6) id f9HAI1h04346;
	Wed, 17 Oct 2001 11:18:01 +0100 (BST)
	(envelope-from timbo)
Date: Wed, 17 Oct 2001 11:18:01 +0100
From: Tim Bunce <Tim.Bunce@pobox.com>
To: "Gary W. Swearingen" <swear@blarg.net>
Cc: Daniel Brown <djb@unixan.com>,
	"Jonathan M. Slivko" <jslivko@4evermail.com>,
	freebsd-questions@freebsd.org, freebsd-stable@freebsd.org
Subject: Re: mergemaster -- whats the best way?
Message-ID: <20011017111801.E1560@dansat.data-plan.com>
References: <001301c15671$6b2effe0$252da818@sioux> <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> <20011016220800.B55640@dansat.data-plan.com> <20011016152927.0cc816e3.djb@unixan.com> <cjsncjkrrp.ncj@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <cjsncjkrrp.ncj@localhost.localdomain>; from swear@blarg.net on Tue, Oct 16, 2001 at 05:57:14PM -0700
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

On Tue, Oct 16, 2001 at 05:57:14PM -0700, Gary W. Swearingen wrote:
> Daniel Brown <djb@unixan.com> writes:
> 
> > Personally, I was thinking of hacking this feature into my own copies of
> > mergemaster some time in the medium future. =)
> 
> I was thinking it would be good to somehow save copies of all installed
> config files (not just MD5s) and make it convenient to compare changes
> in the installed config files instead of comparing an installed file
> with my custom file.

This would allow a three-way diff/merge which would be far better.

Tim.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message