From owner-freebsd-stable@FreeBSD.ORG Wed Mar 18 23:21:31 2009 Return-Path: Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 813F61065673 for ; Wed, 18 Mar 2009 23:21:31 +0000 (UTC) (envelope-from kama@pvp.se) Received: from ms1.as.pvp.se (dns.pvp.se [213.64.187.226]) by mx1.freebsd.org (Postfix) with ESMTP id 3F8198FC17 for ; Wed, 18 Mar 2009 23:21:31 +0000 (UTC) (envelope-from kama@pvp.se) Received: by ms1.as.pvp.se (Postfix, from userid 1001) id 0696EB3; Thu, 19 Mar 2009 00:21:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ms1.as.pvp.se (Postfix) with ESMTP id 05412B1; Thu, 19 Mar 2009 00:21:30 +0100 (CET) Date: Thu, 19 Mar 2009 00:21:29 +0100 (CET) From: kama X-X-Sender: kama@ns1.as.pvp.se To: Doug Barton In-Reply-To: <49C1447C.6060002@FreeBSD.org> Message-ID: <20090319001829.U55869@ns1.as.pvp.se> References: <200903161055.n2GAtHkt077732@lurza.secnetix.de> <49C1447C.6060002@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2009 23:21:32 -0000 On Wed, 18 Mar 2009, Doug Barton wrote: > Oliver Fromme wrote: > > Doug Barton wrote: > > > The attached patch adds a -F option to automatically install files > > > when only the FreeBSD $Ids differ. I've tested this and it seems to do > > > what the people concerned about this issue are asking for. > > > > That seems to be a useful feature. > > Thanks. > > > You need to quote the dollar signs, though. > > Well, not only would that defeat the purpose they are there for, it > wouldn't work. Perhaps you missed the bit where I said that I actually > tested this? :) > > > However, maybe the best solution is to add a new keyword > > for mergemaster.rc, so the user can exactly specify which > > kind of changes should be always installed. > > That's an interesting idea, but I think that the number of times that > there is a nonfunctional change other than to the VCS Id are very > small, and I don't want to complicate this more than it needs to be. > > Please remember that we're dealing with two very different groups of > users. One is the "power user" who updates frequently and can > certainly hack this sort of thing themselves if they really want it. > The other is the "average" user who only updates once or twice a year, > usually to a new release, occasionally to a new patch level, etc. The > vast majority of our users are in the latter category, and they need a > simple tool with a minimum of foot-shooting capacity. One thing that really bother me is the fact that it patches passwd. I would rather only have mergemaster to use the pw command to add and delete users and groups instead. Its especially annoying when it updated passwd without my content on a remote update. /Bjorn