From owner-freebsd-hackers@FreeBSD.ORG  Fri Sep 30 13:27:03 2005
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
X-Original-To: hackers@freebsd.org
Delivered-To: freebsd-hackers@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A5E3316A421
	for <hackers@freebsd.org>; Fri, 30 Sep 2005 13:27:03 +0000 (GMT)
	(envelope-from xfb52@dial.pipex.com)
Received: from smtp-out3.blueyonder.co.uk (smtp-out3.blueyonder.co.uk
	[195.188.213.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 06B7743D48
	for <hackers@freebsd.org>; Fri, 30 Sep 2005 13:27:02 +0000 (GMT)
	(envelope-from xfb52@dial.pipex.com)
Received: from [82.41.253.249] ([82.41.253.249]) by smtp-out3.blueyonder.co.uk
	with Microsoft SMTPSVC(5.0.2195.6713); 
	Fri, 30 Sep 2005 14:27:50 +0100
Message-ID: <433D3D24.10907@dial.pipex.com>
Date: Fri, 30 Sep 2005 14:27:00 +0100
From: Alex Zbyslaw <xfb52@dial.pipex.com>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-GB; rv:1.7.11) Gecko/20050917
X-Accept-Language: en-us, pl
MIME-Version: 1.0
To: Brian Candler <B.Candler@pobox.com>
References: <20050929224548.GB3035@comp.chem.msu.su>
	<20050930084218.GC80146@uk.tiscali.com>
In-Reply-To: <20050930084218.GC80146@uk.tiscali.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 30 Sep 2005 13:27:50.0374 (UTC)
	FILETIME=[C116A060:01C5C5C2]
Cc: hackers@freebsd.org
Subject: Re: A smarter mergemaster
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2005 13:27:03 -0000

Brian Candler wrote:

>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. [*]
>  
>
Not necessarily.  Diff can be made to ignore changes which match 
specific regular expressions (-I), so if you can reliably match the RCS 
Id lines you can ignore those changes.

Note, though, that this is different from files which you haven't 
changed.  The new version might change more than the RCS Id, in which 
you would be back to checksums, or some such.  However, a change to 
automatically install files where *only* the RCS Id had changed would be 
easier and quicker to effect than the general case of all files which 
you hadn't changed.

--Alex