From owner-freebsd-hackers@FreeBSD.ORG Fri Sep 30 08:54:37 2005 Return-Path: X-Original-To: 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 00CE316A41F for ; Fri, 30 Sep 2005 08:54:37 +0000 (GMT) (envelope-from work@ashleymoran.me.uk) Received: from mta08-winn.ispmail.ntl.com (mta08-winn.ispmail.ntl.com [81.103.221.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F9F843D49 for ; Fri, 30 Sep 2005 08:54:36 +0000 (GMT) (envelope-from work@ashleymoran.me.uk) Received: from aamta12-winn.ispmail.ntl.com ([81.103.221.35]) by mta08-winn.ispmail.ntl.com with ESMTP id <20050930085434.FQUA10357.mta08-winn.ispmail.ntl.com@aamta12-winn.ispmail.ntl.com> for ; Fri, 30 Sep 2005 09:54:34 +0100 Received: from jigsaw-sbs02.jigsawhq.com ([213.106.224.113]) by aamta12-winn.ispmail.ntl.com with ESMTP id <20050930085434.SNBM3160.aamta12-winn.ispmail.ntl.com@jigsaw-sbs02.jigsawhq.com> for ; Fri, 30 Sep 2005 09:54:34 +0100 Received: from [192.168.0.181] ([192.168.0.181]) by jigsaw-sbs02.jigsawhq.com with Microsoft SMTPSVC(5.0.2195.6713); Fri, 30 Sep 2005 09:53:46 +0100 Message-ID: <433CFD16.6060200@ashleymoran.me.uk> Date: Fri, 30 Sep 2005 09:53:42 +0100 From: Ashley Moran User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-hackers@freebsd.org References: <20050929224548.GB3035@comp.chem.msu.su> <200509301041.10480.doconnor@gsoft.com.au> In-Reply-To: <200509301041.10480.doconnor@gsoft.com.au> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 30 Sep 2005 08:53:46.0535 (UTC) FILETIME=[77CBEB70:01C5C59C] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2005 08:54:37 -0000 Daniel O'Connor wrote: > This work does look neat, but.. > Try etcmerge :) > It's a bit of a pain to get started with it, but it is a *lot* faster (human > input wise) than mergemaster. It only asks you about files that you have > modified rather than ones that have been changed by committers (ie does a 3 > way merge). > > It does have problems handling DB files, but that is usually not a big problem > to fix. > I read about etcmerge in BSD Hacks and there's been no going back for me. It seems pretty stable even though it's not been updated for a good while. Is there any chance it will ever make it into the FreeBSD core system? Ashley