From owner-freebsd-hackers@FreeBSD.ORG  Fri May 13 16:15:43 2005
Return-Path: <owner-freebsd-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 4A7C716A4CE; Fri, 13 May 2005 16:15:43 +0000 (GMT)
Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za
	[146.64.24.58])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EA6F343D73; Fri, 13 May 2005 16:15:31 +0000 (GMT)
	(envelope-from jhay@icomtek.csir.co.za)
Received: from zibbi.icomtek.csir.co.za (localhost [127.0.0.1])
	j4DGFJEm000214;	Fri, 13 May 2005 18:15:20 +0200 (SAST)
	(envelope-from jhay@zibbi.icomtek.csir.co.za)
Received: (from jhay@localhost)j4DGFABK000205;
	Fri, 13 May 2005 18:15:10 +0200 (SAST)	(envelope-from jhay)
Date: Fri, 13 May 2005 18:15:10 +0200
From: John Hay <jhay@icomtek.csir.co.za>
To: "Daniel O'Connor" <doconnor@gsoft.com.au>
Message-ID: <20050513161510.GA97948@zibbi.icomtek.csir.co.za>
References: <427743ED.6020200@FreeBSD.org> <4284680E.1060008@FreeBSD.org>
	<20050513101554.GA1519@over-yonder.net> <428535F5.3060604@gsoft.com.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <428535F5.3060604@gsoft.com.au>
User-Agent: Mutt/1.4.1i
cc: freebsd-hackers@freebsd.org
cc: Denis Peplin <den@freebsd.org>
cc: "Matthew D. Fuller" <fullermd@over-yonder.net>
Subject: Re: mergemaster improvement (auto-update for not modified files)
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
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, 13 May 2005 16:15:43 -0000

On Sat, May 14, 2005 at 08:49:17AM +0930, Daniel O'Connor wrote:
> Matthew D. Fuller wrote:
> >One thing that I'm pretty sure has been brought up before would be
> >that, for those of us who keep a local CVS repo mirror, it's easy and
> >pretty cheap to check out even arbitrary revs to compare to what's
> >currently there (and if you wanted to be REALLY overly-smart, you
> >could even try automagically merging local changes ;)
> 
> etcmerge can already do this :)

Maybe, but last time I tried to use it, I got the feeling that it was
missing a front end. If its cleverness could be married to the ease
of use of mergemaster, we would have a winner. IMVHO

John
-- 
John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org