Date: Sat, 07 Jul 2001 16:20:11 -0700 From: Dima Dorfman <dima@unixfreak.org> To: j mckitrick <jcm@FreeBSD-uk.eu.org> Cc: "David O'Brien" <obrien@freebsd.org>, freebsd-current@freebsd.org Subject: Re: conficting cvs version numbers? Message-ID: <20010707232012.F105E3E28@bazooka.unixfreak.org> In-Reply-To: <20010707234608.A26201@dogma.freebsd-uk.eu.org>; from jcm@FreeBSD-uk.eu.org on "Sat, 7 Jul 2001 23:46:08 %2B0100"
next in thread | previous in thread | raw e-mail | index | archive | help
j mckitrick <jcm@FreeBSD-uk.eu.org> writes: > 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:~> Are you using FreeBSD locally to do these checkouts? It sounds like cvs isn't expanding $FreeBSD$ on your local machine. See, when someone checks in a file, it gets checked in with the *old* $FreeBSD$ line; cvs is supposed to update it on checkout. That last bit isn't happening in your case for some reason. Since $FreeBSD$ (well, all custom keywords) are a FreeBSD extension, trying to use another system will give the results you're seeing. 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?20010707232012.F105E3E28>