From owner-freebsd-stable@FreeBSD.ORG Tue Feb 24 08:58:33 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 2E2E41065670 for ; Tue, 24 Feb 2009 08:58:33 +0000 (UTC) (envelope-from kstewart@owt.com) Received: from smtp.owt.com (smtp.owt.com [66.119.213.2]) by mx1.freebsd.org (Postfix) with ESMTP id 033908FC1D for ; Tue, 24 Feb 2009 08:58:32 +0000 (UTC) (envelope-from kstewart@owt.com) Received: from kstewart2.owt.com (kstewart2.owt.com [64.146.237.228]) (authenticated bits=0) by smtp.owt.com (8.13.8/8.13.8) with ESMTP id n1O8wVoZ001345; Tue, 24 Feb 2009 00:58:31 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=owt.com; s=default; t=1235465912; bh=5xZ3U3T37ImJ4w328EbKIjpijpo+tp4jy5Gn307EOKk=; h=From:To:Subject:Date:Cc:References:In-Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id; b=Dy/VoptQFCrnC ID+Go64WGLjVV0j0bGKfJB8vTxaOWnP+hYcSekTN0NLzuadTb48DpEWt+zYC27/Gx+G kGzF8tSSRqw70PX6J15+n7roDS2/LjgvCog8HUbrrp8bT0S+EinA68k1GbchhPI7PsJ os5+A3lcxdBOLKKPzRfabXQU= From: Kent Stewart To: freebsd-stable@freebsd.org Date: Tue, 24 Feb 2009 00:58:31 -0800 User-Agent: KMail/1.9.10 References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200902240058.31212.kstewart@owt.com> Cc: Warren Block 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: Tue, 24 Feb 2009 08:58:33 -0000 On Monday 23 February 2009 10:11:45 pm 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 > > 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/*. > > The version numbers and dates in mergemaster look wrong. For example, > /etc/bluetooth/hcsecd.conf: > > # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $ > # $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.3 2006/05/18 17:53:49 emax > Exp $ > > Shouldn't that be 1.3.6.1 from Tue Nov 25 02:59:29 2008? > > The latest entries for files in /etc/isdn are 9 months old, and were > removals. > > This looks like an error, but maybe I'm missing something. And other > cvsup mirrors seem to agree with cvsup9. You are looking at the version for the 7.1 release version. The RELENG_7 version is Revision 1.3: download - view: text, markup, annotated - select for diffs Thu May 18 17:53:49 2006 UTC (2 years, 9 months ago) by emax Branches: MAIN CVS tags: RELENG_7_BP, RELENG_7_1_BP, RELENG_7_0_BP, RELENG_7_0_0_RELEASE, RELENG_7_0, RELENG_7, HEAD Branch point for: RELENG_7_1 Diff to: previous 1.2: preferred, colored Changes since revision 1.2: +1 -1 lines Go to http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/bluetooth/hcsecd.conf and you can see the versions and the tags. Kent -- kent Stewart Richland, WA http://users.owt.com/kstewart/index.html