From owner-freebsd-hackers@FreeBSD.ORG Sat Oct 1 19:35:49 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 71DFB16A41F for ; Sat, 1 Oct 2005 19:35:49 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id A132B43D46 for ; Sat, 1 Oct 2005 19:35:48 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.3/8.13.3) with ESMTP id j91JZcoF036736; Sat, 1 Oct 2005 23:35:38 +0400 (MSD) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.3/8.13.3/Submit) id j91JZcUn036735; Sat, 1 Oct 2005 23:35:38 +0400 (MSD) (envelope-from yar) Date: Sat, 1 Oct 2005 23:35:38 +0400 From: Yar Tikhiy To: Kevin Oberman Message-ID: <20051001193538.GA27782@comp.chem.msu.su> References: <433CDE35.7040801@FreeBSD.org> <20050930213705.95F265D07@ptavv.es.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050930213705.95F265D07@ptavv.es.net> User-Agent: Mutt/1.5.9i 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:35:49 -0000 On Fri, Sep 30, 2005 at 02:37:05PM -0700, Kevin Oberman wrote: > > 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). I > have to restore my profile.sh (which MUST be in /etc/rc.d as it needs to > be run before /usr is mounted). > > I do have an open PR on this (conf/85449), but it does not seem to have > gone anywhere other than being assigned to you last Friday. (No, I > didn't expect anything to happen this quickly. You just gave me such a > perfect opportunity to gripe!) FWIW, I wondered if my version of mergemaster in p4 was affected by this issue and found to my surprise that I had already addressed it in my changes. -- Yar