From owner-freebsd-stable@FreeBSD.ORG Fri Feb 27 22:36:18 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 B9E77106566C for ; Fri, 27 Feb 2009 22:36:18 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id 55AB28FC12 for ; Fri, 27 Feb 2009 22:36:18 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.3/8.14.3) with ESMTP id n1RMaHtj060581; Fri, 27 Feb 2009 15:36:17 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.3/8.14.3/Submit) with ESMTP id n1RMaH1g060578; Fri, 27 Feb 2009 15:36:17 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Fri, 27 Feb 2009 15:36:17 -0700 (MST) From: Warren Block To: Doug Barton In-Reply-To: <49A4BC40.1080301@FreeBSD.org> Message-ID: References: <49A4BC40.1080301@FreeBSD.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (wonkity.com [127.0.0.1]); Fri, 27 Feb 2009 15:36:17 -0700 (MST) Cc: freebsd-stable@freebsd.org Subject: Re: Old /etc files back, or cvs error? 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: Fri, 27 Feb 2009 22:36:19 -0000 On Tue, 24 Feb 2009, Doug Barton wrote: > Warren Block wrote: > >> mergemaster adds a *lot* of old files in /etc that were not there in >> 7.1-RELEASE. (Remember the rc.d rework? Like that.) For example, a >> bunch of bluetooth files and /etc/isdn/*. > > That is definitely not the outcome you should have ended up with. I should have been more careful in watching what was going on. It wasn't adding files, just "updating" files that only differed in version strings. A test system showed that as of now, there's somewhere around 325 files in /etc like that. That's not counting files which will probably be different like /etc/master.passwd and /etc/group, or the sendmail files which are customized with "built by" messages. (The differing file version strings are due to the svn to cvs export, as explained by Erik Trulsson.) > If that doesn't work, please script your mergemaster session and send > us the output. I did save both a full session and a cleaned list of files from a test system built with 7.1-RELEASE and updated to 7-STABLE: http://www.wonkity.com/~wblock/freebsd-7-stable/ Only after manually creating that list of files did it occur to me that there ought to be a way to skip files that differ only in version strings, and that mergemaster should have that. And *then* I finally checked the man page for mergemaster, where the mysterious -U option is described. mergemaster -U works fine. Had I only been lazy enough to look it up beforehand... The mergemaster man page doesn't tell how mergemaster detects "files that have not been user modified", so I'm not sure how safe -U really is. If it's safe for everyday users, then the second mergemaster step in the standard updating procedure in the Handbook should include the -U. The svn/cvs/version string thing sure looks like a bug, but no doubt fixing it is easier said than done. -Warren Block * Rapid City, South Dakota USA