From owner-freebsd-hackers@FreeBSD.ORG Fri Sep 30 14:06:04 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 785B816A420 for ; Fri, 30 Sep 2005 14:06:04 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from mv.twc.weather.com (mv.twc.weather.com [65.212.71.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23AF443D55 for ; Fri, 30 Sep 2005 14:06:02 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from [10.50.41.233] (Not Verified[10.50.41.233]) by mv.twc.weather.com with NetIQ MailMarshal (v6, 0, 3, 8) id ; Fri, 30 Sep 2005 10:22:02 -0400 From: John Baldwin To: freebsd-hackers@freebsd.org Date: Fri, 30 Sep 2005 09:07:16 -0400 User-Agent: KMail/1.8 References: <20050929224548.GB3035@comp.chem.msu.su> <20050930110841.GC45907@comp.chem.msu.su> In-Reply-To: <20050930110841.GC45907@comp.chem.msu.su> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200509300907.17730.jhb@FreeBSD.org> Cc: Yar Tikhiy , Jon Dama 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 14:06:04 -0000 On Friday 30 September 2005 07:08 am, Yar Tikhiy wrote: > [Replying to everyone who mentioned etcmerge or 3-way merge in general] > > On Fri, Sep 30, 2005 at 12:15:59AM -0700, Jon Dama wrote: > > It is worth while to mention sysutils/etcmerge. > > > > Having the "three-way" merge makes the process much better. The primary > > way I've shot myself with mergemaster is forgetting some local change. > > > > Being able to distinguish the class of things that are changing upstream > > really helps the situation and provides a more reasonable indication of > > the default: > > if it changed upstream but not locally => default is install > > if it changed locally but not upstream => default is keep > > if it changed locally and upstream => default is merge > > Obviously, in order to do a 3-way merge, we need information about > the old versions of original files as well. However, currently we > have only the new versions in /usr/src and local versions in /etc > for mergemaster to work with. I'll be glad to hear how etcmerge > approaches this issue. > > In any case, we cannot offer the users to access the CVS repo when > merging /etc. Personally, I'd like to see a complete copy of current > unmodified /etc files installed to /usr/share/examples/etc. They > could serve as the old original versions for the 3-way merge then. > Alas, now the copy installed there is rather incomplete, motivation > of which is unknown to me yet. Any ideas? I do the equivalent of etcmerge (sort of) by hand using some old instructions from the handbook (pre-mm). Basically, for each installworld, you do a distribute of src/etc into /var/tmp/root-YYMMDD. Then you keep around the previous tree and just compare the two previous trees and merge those changes into /etc. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org