Date: Wed, 11 Jul 2001 00:27:09 +0100 From: j mckitrick <jcm@FreeBSD-uk.eu.org> To: David Wolfskill <david@catwhisker.org> Subject: Re: conficting cvs version numbers? Message-ID: <20010711002709.A58482@dogma.freebsd-uk.eu.org> In-Reply-To: <200107072320.f67NKpp28385@bunrab.catwhisker.org>; from david@catwhisker.org on Sat, Jul 07, 2001 at 04:20:51PM -0700 References: <20010707234608.A26201@dogma.freebsd-uk.eu.org> <200107072320.f67NKpp28385@bunrab.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jul 07, 2001 at 04:20:51PM -0700, David Wolfskill wrote: | >Date: Sat, 7 Jul 2001 23:46:08 +0100 | >From: j mckitrick <jcm@FreeBSD-uk.eu.org> | | >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? | | For some arbitrary file in your working directory, please show the | following: | | * the output of "cvs status <filename>" root:...sys/dev/ppbus# cvs status immio.c =================================================================== File: immio.c Status: Up-to-date Working revision: 1.16 Sat Jun 23 06:51:51 2001 Repository revision: 1.16 /mnt/cvs/src/sys/dev/ppbus/immio.c,v Sticky Tag: 1.16 Sticky Date: (none) Sticky Options: (none) root:...sys/dev/ppbus# | * the output of "cat CVS/Root" (where the "CVS" subdirectory is in the | same directory as the file in question). local:...sys/dev/ppbus> cat CVS/Root /mnt/cvs local:...sys/dev/ppbus> | * the output of "cat CVS/Repository" (where the "CVS" subdirectory is in | the same directory as the file in question). local:...sys/dev/ppbus> cat CVS/Repository src/sys/dev/ppbus local:...sys/dev/ppbus> | * what you think the path to your CVS repository is. local:...sys/dev/ppbus> echo $CVSROOT /mnt/cvs local:...sys/dev/ppbus> | | >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:~> | | Here's the above information for the above file in my -CURRENT working | directory: | | * dhcp-140[1] cd /C/usr/src/sys/dev/ppbus | dhcp-140[2] cvs status immio.c | =================================================================== | File: immio.c Status: Up-to-date | | Working revision: 1.16 Sat Jun 23 13:00:08 2001 | Repository revision: 1.16 /cvs/freebsd/src/sys/dev/ppbus/immio.c,v | Sticky Tag: (none) | Sticky Date: (none) | Sticky Options: (none) | | | * dhcp-140[3] cat CVS/Root | /cvs/freebsd | | * dhcp-140[4] cat CVS/Repository | src/sys/dev/ppbus | | * Path to CVS repository is /cvs, but to the FreeBSD part of it is | /cvs/freebsd. | | (And hat last is where I screwed up: I originally had specified "/cvs" | as the CVSROOT, and that meant that the $FreeBSD$ tag wasn't getting | expanded, which resulted in exactly the symptoms you are describing.) | | Cheers, | david | -- | David H. Wolfskill david@catwhisker.org | As a computing professional, I believe it would be unethical for me to | advise, recommend, or support the use (save possibly for personal | amusement) of any product that is or depends on any Microsoft product. 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-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010711002709.A58482>