From owner-freebsd-hackers@FreeBSD.ORG Sat Oct 1 19:42:16 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 13DC916A41F for ; Sat, 1 Oct 2005 19:42:16 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mail2.fluidhosting.com [204.14.90.62]) by mx1.FreeBSD.org (Postfix) with SMTP id 4E1E143D6D for ; Sat, 1 Oct 2005 19:42:11 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 8522 invoked by uid 399); 1 Oct 2005 19:42:11 -0000 Received: from mail1.fluidhosting.com (204.14.90.61) by mail2.fluidhosting.com with SMTP; 1 Oct 2005 19:42:11 -0000 Received: (qmail 84426 invoked by uid 399); 1 Oct 2005 19:42:09 -0000 Received: from localhost (HELO ?192.168.1.102?) (dougb@dougbarton.net@127.0.0.1) by localhost with SMTP; 1 Oct 2005 19:42:09 -0000 Message-ID: <433EE690.9070408@FreeBSD.org> Date: Sat, 01 Oct 2005 12:42:08 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla Thunderbird 1.0.7 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Kevin Oberman References: <20050930213705.95F265D07@ptavv.es.net> In-Reply-To: <20050930213705.95F265D07@ptavv.es.net> X-Enigmail-Version: 0.92.1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-hackers@FreeBSD.org 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: Sat, 01 Oct 2005 19:42:16 -0000 Kevin Oberman wrote: >>Date: Thu, 29 Sep 2005 23:41:57 -0700 >>From: Doug Barton >>Sender: owner-freebsd-current@freebsd.org >> >>One of the design decisions that you need to be aware of for this project >>since day one was to try and balance intelligent behavior and configuration >>options that would be useful for the very small percentage of the FreeBSD >>user community that constitutes our developers, versus the needs of the vast >>majority of "regular" users who need to be able to use the tool without >>becoming experts in either our build system, or the tool itself. That is why >>every single default for mergemaster is to do nothing. It was a purposeful >>decision to require the user to examine change requests, and make an >>affirmative choice to approve them. > > > Doug, > > You just hit on one of my pet peeves with mergemaster! Contrary to what > you say: "every single default for mergemaster is to do nothing", when a > file is found in /etc/rc.d that is not in /usr/src/etc/rc.d, the default > is to delete the file in etc. I think that this is a bad thing(tm). Agreed, The only thing I can think of as a reason for the anomaly is that at the time I wrote that code, the problems being reported with stale rc files were pretty numerous, and perhaps I was being overzealous. I've already said that I like Yar's idea of offering options to delete files or not, so I'll look at bringing at least that code in ASAP with the change that you requested, and possibly seek an MFC before 6 release. > By the way, having run FreeBSD before mergemaster, it's a huge > improvement on those ugly days. Thanks for the kind words, they are always appreciated. :) I should also take this opportunity to say that I appreciate all the interesting ideas on this thread, and I am paying attention to what's said even if I don't comment on it. Doug -- This .signature sanitized for your protection