Re: conficting cvs version numbers?
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. -- -- David ([EMAIL PROTECTED]) To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: conficting cvs version numbers?
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 [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: conficting cvs version numbers?
j mckitrick [EMAIL PROTECTED] 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 [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: conficting cvs version numbers?
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? As someone already mentioned, you may have -k set for that file. If you don't know, send us the output of cvs status immio.c. gh Jonathon -- Microsoft complaining about the source license used by Linux is like the event horizon calling the kettle black. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: conficting cvs version numbers?
Date: Fri, 6 Jul 2001 23:52:05 +0100 From: j mckitrick [EMAIL PROTECTED] I'm *sure* I'm doing something wrong here, but I can't figure it out. I am using cvsup to keep a -current cvs tree on my system. According to the web access cvs tree, a file I am looking at should be version 1.16. When I try cvs -R co -f src/sys/dev/ppbus/immio.c 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. The same string expanded in the web cvs tree says 1.16. It seems I am always one behind, even though HEAD in the cvs file reflects the -current version. What silly mistake am I making? Probably didn't actually specify the proper CVSROOT directory. I made the same mistake the first time 'round on my laptop; the sordid details are at http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=452791+491892+/usr/local/www/db/text/2001/freebsd-current/20010520.freebsd-current Cheers, david -- David H. Wolfskill [EMAIL PROTECTED] 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. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: conficting cvs version numbers?
In article [EMAIL PROTECTED], David Wolfskill [EMAIL PROTECTED] wrote: From: j mckitrick [EMAIL PROTECTED] When I try cvs -R co -f src/sys/dev/ppbus/immio.c 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. The same string expanded in the web cvs tree says 1.16. It seems I am always one behind, even though HEAD in the cvs file reflects the -current version. What silly mistake am I making? Probably didn't actually specify the proper CVSROOT directory. Or maybe you have a sticky tag or sticky date set on that file. You can find out with cvs status. To clear it, use -A instead of -f in your cvs checkout command. (Why are you using -f anyway? I've never yet encountered a situation in this project where it was needed.) John -- John Polstra [EMAIL PROTECTED] John D. Polstra Co., Inc.Seattle, Washington USA Disappointment is a good sign of basic intelligence. -- Chögyam Trungpa To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
