From owner-freebsd-current@FreeBSD.ORG Wed Nov 28 23:57:04 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C82516A417 for ; Wed, 28 Nov 2007 23:57:04 +0000 (UTC) (envelope-from simon@benji.nitro.dk) Received: from mx.nitro.dk (zarniwoop.nitro.dk [83.92.207.38]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD4213C467 for ; Wed, 28 Nov 2007 23:57:03 +0000 (UTC) (envelope-from simon@benji.nitro.dk) Received: from benji.nitro.dk (unknown [192.168.3.39]) by mx.nitro.dk (Postfix) with ESMTP id 904FC2DD23F; Wed, 28 Nov 2007 23:38:24 +0000 (UTC) Received: by benji.nitro.dk (Postfix, from userid 2000) id 5A297FD22; Thu, 29 Nov 2007 00:38:36 +0100 (CET) Date: Thu, 29 Nov 2007 00:38:36 +0100 From: "Simon L. Nielsen" To: Daniel O'Connor Message-ID: <20071128233835.GA998@zaphod.nitro.dk> References: <20071128211626.0BB084500E@ptavv.es.net> <200711290956.28281.doconnor@gsoft.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200711290956.28281.doconnor@gsoft.com.au> User-Agent: Mutt/1.5.16 (2007-06-09) Cc: Giorgos Keramidas , freebsd-current@freebsd.org, "Aryeh M. Friedman" Subject: Re: idea bouncing: using cvs as a replacement for mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2007 23:57:04 -0000 On 2007.11.29 09:56:27 +1030, Daniel O'Connor wrote: > On Thu, 29 Nov 2007, Kevin Oberman wrote: > > > It is a port - sysutils/etcmerge. > > > > Another simple solution, which needs more publicity, is 'mergemaster > > -U'. I do my updates using -Ui and seldom have to deal any manual > > merge. It's not perfect as I still need to deal with locally modified > > files, but "it's good enough". > > The beauty of etcmerge is that only conflicting changes are a problem > and they are quite rare. That is (well, mostly) what mergemaster -iU does, and it's in the base system :-). I only tried etcmerge once, but considering the number of heterogeneous systems I help manage or co-manage I found the setup to be enough work that I never got past trying it out once. I run mergemaster quite often, and I must say after the -U functionality it's normally very quickly done. Just my 0.00002DKK - Time to go back to my litle corner :-). -- Simon L. Nielsen