Date: Sat, 1 Oct 2005 23:35:38 +0400 From: Yar Tikhiy <yar@comp.chem.msu.su> To: Kevin Oberman <oberman@es.net> Cc: freebsd-hackers@freebsd.org Subject: Re: A smarter mergemaster Message-ID: <20051001193538.GA27782@comp.chem.msu.su> In-Reply-To: <20050930213705.95F265D07@ptavv.es.net> References: <433CDE35.7040801@FreeBSD.org> <20050930213705.95F265D07@ptavv.es.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051001193538.GA27782>