From owner-freebsd-hackers@FreeBSD.ORG Sat May 14 02:27:22 2005 Return-Path: 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 857DA16A4CE; Sat, 14 May 2005 02:27:22 +0000 (GMT) Received: from smtp1.adl2.internode.on.net (smtp1.adl2.internode.on.net [203.16.214.181]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88C5B43D41; Sat, 14 May 2005 02:27:19 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from midget.dons.net.au (ppp209-194.lns1.adl2.internode.on.net [203.122.209.194])j4E2R5xY080783; Sat, 14 May 2005 11:57:09 +0930 (CST) Received: from [10.0.2.110] (root@localhost.dons.net.au [127.0.0.1]) (authenticated bits=0) by midget.dons.net.au (8.13.1/8.13.1) with ESMTP id j4E2R3fK058179; Sat, 14 May 2005 11:57:03 +0930 (CST) (envelope-from doconnor@gsoft.com.au) Message-ID: <4285621D.7030503@gsoft.com.au> Date: Sat, 14 May 2005 11:57:41 +0930 From: "Daniel O'Connor" User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103) X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Hay References: <427743ED.6020200@FreeBSD.org> <4284680E.1060008@FreeBSD.org> <20050513101554.GA1519@over-yonder.net> <428535F5.3060604@gsoft.com.au> <20050513161510.GA97948@zibbi.icomtek.csir.co.za> In-Reply-To: <20050513161510.GA97948@zibbi.icomtek.csir.co.za> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.4 () ALL_TRUSTED X-Scanned-By: MIMEDefang 2.44 cc: freebsd-hackers@freebsd.org cc: Denis Peplin cc: "Matthew D. Fuller" 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 02:27:22 -0000 John Hay wrote: >>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 Yes, it is a little more difficult to use since it doesn't walk you through resolving conflicts. Still, it is very powerful and in general you don't have to resolve any conflicts so total amount of work required is small. -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Key ID - 7B3FCE8C