From owner-freebsd-current Sat Jul 7 15:46:22 2001 Delivered-To: freebsd-current@freebsd.org Received: from serenity.mcc.ac.uk (serenity.mcc.ac.uk [130.88.200.93]) by hub.freebsd.org (Postfix) with ESMTP id 7E71E37B405; Sat, 7 Jul 2001 15:46:14 -0700 (PDT) (envelope-from jcm@freebsd-uk.eu.org) Received: from dogma.freebsd-uk.eu.org ([130.88.200.97] ident=root) by serenity.mcc.ac.uk with esmtp (Exim 2.05 #6) id 15J0q2-0008Wm-00; Sat, 7 Jul 2001 23:46:10 +0100 Received: (from jcm@localhost) by dogma.freebsd-uk.eu.org (8.11.3/8.11.1) id f67Mk9o26290; Sat, 7 Jul 2001 23:46:09 +0100 (BST) (envelope-from jcm) Date: Sat, 7 Jul 2001 23:46:08 +0100 From: j mckitrick To: "David O'Brien" Cc: freebsd-current@freebsd.org Subject: Re: conficting cvs version numbers? Message-ID: <20010707234608.A26201@dogma.freebsd-uk.eu.org> References: <20010706235205.B7843@dogma.freebsd-uk.eu.org> <20010707120018.G16759@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: <20010707120018.G16759@dragon.nuxi.com>; from obrien@freebsd.org on Sat, Jul 07, 2001 at 12:00:19PM -0700 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Jul 07, 2001 at 12:00:19PM -0700, David O'Brien wrote: | On Fri, Jul 06, 2001 at 11:52:05PM +0100, j mckitrick wrote: | > I get version 1.15. When I look at the .c,v file in the cvs tree, it says | > HEAD is 1.16, but $Id says it is 1.15. | | We don't use "$Id$" anymore. Do you mean "$FreeBSD$"? If so, please try | to be more exact. Also try ``cvs status'' on the file. My mistake. I was just using generic terminology. Well, according to status, I *do* have the latest version. But here is the confusing part. I have 1.16 of the file locally In the web CVS repository, $FreeBSD$ expands to version 1.16 In my local version, $FreeBSD$ is expanded to version 1.15 What could explain this? p.s. I just downloaded the file from the web repository and diff'ed it with the one in my local directory: local:~> diff immio.c /sys/dev/ppbus/immio.c 27c27 < * $FreeBSD: src/sys/dev/ppbus/immio.c,v 1.16 2001/06/23 06:51:51 nsouch Exp $ --- > * $FreeBSD: src/sys/dev/ppbus/immio.c,v 1.15 2001/01/25 13:07:55 nsouch > Exp $ local:~> Jonathon -- Microsoft complaining about the source license used by Linux is like the event horizon calling the kettle black. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message