Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Jul 2001 23:46:08 +0100
From:      j mckitrick <jcm@FreeBSD-uk.eu.org>
To:        "David O'Brien" <obrien@freebsd.org>
Cc:        freebsd-current@freebsd.org
Subject:   Re: conficting cvs version numbers?
Message-ID:  <20010707234608.A26201@dogma.freebsd-uk.eu.org>
In-Reply-To: <20010707120018.G16759@dragon.nuxi.com>; from obrien@freebsd.org on Sat, Jul 07, 2001 at 12:00:19PM -0700
References:  <20010706235205.B7843@dogma.freebsd-uk.eu.org> <20010707120018.G16759@dragon.nuxi.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010707234608.A26201>