From owner-svn-src-all@FreeBSD.ORG Thu Jun 18 18:34:45 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86026106566B for ; Thu, 18 Jun 2009 18:34:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 39FD98FC0C for ; Thu, 18 Jun 2009 18:34:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 20381 invoked by uid 399); 18 Jun 2009 18:34:39 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 18 Jun 2009 18:34:39 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A3A88BD.5030703@FreeBSD.org> Date: Thu, 18 Jun 2009 11:34:37 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (X11/20090423) MIME-Version: 1.0 To: =?UTF-8?B?RGFnLUVybGluZyBTbcO4cmdyYXY=?= References: <200906071326.n57DQvSG095104@svn.freebsd.org> <86iqiudm63.fsf@ds4.des.no> In-Reply-To: <86iqiudm63.fsf@ds4.des.no> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Edwin Groothuis Subject: Re: svn commit: r193635 - head/etc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 18:34:45 -0000 Dag-Erling Smørgrav wrote: > Edwin Groothuis writes: >> Author: edwin >> Date: Sun Jun 7 13:26:57 2009 >> New Revision: 193635 >> URL: http://svn.freebsd.org/changeset/base/193635 >> >> Log: >> Welcome to a default installed /etc/ntp.conf > > Great, now mergemaster blew away my ntp.conf and installed this one > instead. Apparently, it thinks AUTO_UPGRADE means it's fine to > overwrite an existing file with a new one... Yes, that's exactly what the option means. The problem comes in because it's a new file, which means that there is no record of it in the mtree file, so it does not show up as "changed." The problem is compounded by the fact that this is the first time I can remember that we've introduced a new file in the base that has the same name as a commonly (pre-)existing file that most users would have in /etc (as opposed to having it in /usr/local). Suggestions on how to deal with this issue are welcome. Please follow up on -current or -hackers. FWIW, this is one of the reasons that I resisted the idea of using mtree for this function, and continue to resist the idea of the -U option being the default. There is no way that I can see to have mtree list the files that have _not_ changed, which would be the safest way to implement this option. If someone wants to implement that option for mtree I will gladly update the -U option in mergemaster. (Looking at doing the change in mtree myself is "on the list," but it's way down there ...) Meanwhile I'm sure you were able to restore from backups, and there is always mergemaster's -P option .... Doug -- This .signature sanitized for your protection