From owner-freebsd-stable@FreeBSD.ORG Wed Feb 25 03:34:29 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 CD3C9106564A for ; Wed, 25 Feb 2009 03:34:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 64F728FC08 for ; Wed, 25 Feb 2009 03:34:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 26144 invoked by uid 399); 25 Feb 2009 03:34:24 -0000 Received: from localhost (HELO ?192.168.0.19?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 25 Feb 2009 03:34:24 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49A4BC40.1080301@FreeBSD.org> Date: Tue, 24 Feb 2009 19:34:24 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Warren Block References: In-Reply-To: X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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: Wed, 25 Feb 2009 03:34:30 -0000 Warren Block wrote: > Lately I've installed a couple of test systems from 7.1-RELEASE CDs, > then csupped to RELENG_7 from cvsup9: > > *default host=cvsup9.FreeBSD.org > *default base=/var/db > *default prefix=/usr > *default release=cvs tag=RELENG_7 > *default delete use-rel-suffix That looks right. > 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 just checked both the official svn repo and the official cvs repo and the files they are passing out for the two relevant branches are correct, and the real differences (not $Id tags) between the files in the two branches are what I expected to see. Therefore, the problem is somewhere downstream. > This looks like an error, but maybe I'm missing something. And other > cvsup mirrors seem to agree with cvsup9. My suggestion to you would be to move all source trees that you may have currently somewhere else, move aside /var/db/sup, then start over from scratch and see if what you get is what you expect. If that doesn't work, please script your mergemaster session and send us the output. hope this helps, Doug -- This .signature sanitized for your protection