From owner-freebsd-current@FreeBSD.ORG  Fri Sep 30 08:41:54 2005
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: current@freebsd.org
Delivered-To: freebsd-current@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A950416A41F;
	Fri, 30 Sep 2005 08:41:54 +0000 (GMT)
	(envelope-from b.candler@pobox.com)
Received: from leto.uk.clara.net (leto.uk.clara.net [80.168.69.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5018B43D48;
	Fri, 30 Sep 2005 08:41:54 +0000 (GMT)
	(envelope-from b.candler@pobox.com)
Received: from bloodhound.noc.clara.net ([195.8.70.207])
	by leto.uk.clara.net with esmtp (Exim 4.43)
	id 1ELGSn-000EGK-9A; Fri, 30 Sep 2005 09:41:53 +0100
Received: from personal by bloodhound.noc.clara.net with local (Exim 4.52
	(FreeBSD)) id 1ELGTC-000KuD-55; Fri, 30 Sep 2005 09:42:18 +0100
Date: Fri, 30 Sep 2005 09:42:18 +0100
From: Brian Candler <B.Candler@pobox.com>
To: Yar Tikhiy <yar@comp.chem.msu.su>
Message-ID: <20050930084218.GC80146@uk.tiscali.com>
References: <20050929224548.GB3035@comp.chem.msu.su>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050929224548.GB3035@comp.chem.msu.su>
User-Agent: Mutt/1.4.2.1i
Cc: hackers@freebsd.org, current@freebsd.org
Subject: Re: A smarter mergemaster
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2005 08:41:54 -0000

On Fri, Sep 30, 2005 at 02:45:48AM +0400, Yar Tikhiy wrote:
> The fruitiest features are as follows:

Will it automatically install new versions of files where the old one was
not altered? That's my biggest bugbear with mergemaster - it asks you about
a zillion files in /etc/rc.d which you have to manually agree to overwrite
just because the RCS ID has changed. In those cases where you've not altered
them yourself, I think you should just get the latest version. However to do
this properly, you'd need checksums of the original files. [*]

Also, can we have mergemaster work as part of the binary upgrade process too
please... the new files are in /usr/share/examples/etc so I don't see why we
can't merge directly from there into /etc

Regards,

Brian.

[*] http://lists.freebsd.org/mailman/htdig/freebsd-current/2005-May/049784.html
point 4.