From owner-freebsd-stable@FreeBSD.ORG  Mon Sep 22 11:55:30 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2841C16A4B3
	for <stable@freebsd.org>; Mon, 22 Sep 2003 11:55:30 -0700 (PDT)
Received: from rwcrmhc13.comcast.net (rwcrmhc13.comcast.net [204.127.198.39])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B28F43FF5
	for <stable@freebsd.org>; Mon, 22 Sep 2003 11:55:29 -0700 (PDT)
	(envelope-from freebsd-stable-local@be-well.no-ip.com)
Received: from be-well.ilk.org (be-well.no-ip.com[66.30.200.37])
          by comcast.net (rwcrmhc13) with ESMTP
          id <2003092218552801500gqnmfe>; Mon, 22 Sep 2003 18:55:28 +0000
Received: from be-well.ilk.org (lowellg.ne.client2.attbi.com [66.30.200.37]
	(may be forged))
	by be-well.ilk.org (8.12.9/8.12.9) with ESMTP id h8MItR5k046063;
	Mon, 22 Sep 2003 14:55:27 -0400 (EDT)
	(envelope-from freebsd-stable-local@be-well.no-ip.com)
Received: (from lowell@localhost)
	by be-well.ilk.org (8.12.9/8.12.6/Submit) id h8MItQld046060;
	Mon, 22 Sep 2003 14:55:26 -0400 (EDT)
X-Authentication-Warning: be-well.ilk.org: lowell set sender to
	freebsd-stable-local@be-well.ilk.org using -f
Sender: lowell@be-well.no-ip.com
To: Dmitry Agafonov <aga@rsm.ru>
References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru>
From: Lowell Gilbert <freebsd-stable-local@be-well.no-ip.com>
Date: 22 Sep 2003 14:55:26 -0400
In-Reply-To: <3F6F0A0C.1060308@rsm.ru>
Message-ID: <447k404pr5.fsf@be-well.ilk.org>
Lines: 20
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
cc: stable@freebsd.org
Subject: Re: About mergemaster (Re: upgrading)
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: stable@freebsd.org
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Sep 2003 18:55:30 -0000

Dmitry Agafonov <aga@rsm.ru> writes:

> Most painful procedure for me is running mergemaster. Most of the job
> I'm changing 2-3 system configs, so one can see changed file simply
> comparing md5
> hash of the original file, say, in the "$MD5: " custom header (not
> including that line itself
> while calculating hash, or it will be a big trick to produce such file).
> 
> How the idea?

It would be a little tricky; it would probably be easier to keep an
mtree database (thus, not modifying the files themselves for the state
information) and track the default ones themselves.  Other people have
had this basic idea before, but none of them have implemented it, as
far as I can see from the PR database.  The mergemaster author didn't
especially like the idea, because he thinks people ought to know how
their computers are configured.

I'll be happy to take a look at your patches when you get it working.