Re: $FreeBSD tag confusion
Neil Blakey-Milner writes: >On Wed 1999-09-01 (21:03), Kevin Street wrote: >> I think I should set up a separate cvs repository for the FreeBSD src >> since I may not want the same options for my own cvs repository. In >> particular that tagexpand line turns off all tag expansions except for >> $FreeBSD and $Id. > >Does this include $Date? I think the www tree expects them to be >expanded. (I can't check at the moment, though) $Date is off. -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
On Wed 1999-09-01 (21:03), Kevin Street wrote: > I think I should set up a separate cvs repository for the FreeBSD src > since I may not want the same options for my own cvs repository. In > particular that tagexpand line turns off all tag expansions except for > $FreeBSD and $Id. Does this include $Date? I think the www tree expects them to be expanded. (I can't check at the moment, though) Neil -- Neil Blakey-Milner [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
"Matthew D. Fuller" <[EMAIL PROTECTED]> writes: > On Wed, Sep 01, 1999 at 09:20:44PM +0800, a little birdie told me > that Peter Wemm remarked > > > > 23> cat /home/ncvs/CVSROOT/options > > tag=FreeBSD=CVSHeader > > tagexpand=iFreeBSD,Id > > Speaking of the whole subject, where is this (method of defining tags) > documented? I've searched every bit of CVS documentation I can find > anywhere, and none of it mentions this. /usr/src/contrib/cvs/src/main.c and rcs.c Looks like part of this was pulled in from OpenBSD and then enhanced. I couldn't find any documentation either. I think I should set up a separate cvs repository for the FreeBSD src since I may not want the same options for my own cvs repository. In particular that tagexpand line turns off all tag expansions except for $FreeBSD and $Id. -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
On Wed, Sep 01, 1999 at 09:20:44PM +0800, a little birdie told me that Peter Wemm remarked > > 23> cat /home/ncvs/CVSROOT/options > tag=FreeBSD=CVSHeader > tagexpand=iFreeBSD,Id Speaking of the whole subject, where is this (method of defining tags) documented? I've searched every bit of CVS documentation I can find anywhere, and none of it mentions this. -- Matthew Fuller (MF4839) |[EMAIL PROTECTED] Unix Systems Administrator |[EMAIL PROTECTED] Specializing in FreeBSD |http://www.over-yonder.net/ FutureSouth Communications |ISPHelp ISP Consulting "The only reason I'm burning my candle at both ends, is because I haven't figured out how to light the middle yet" To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
On Wed, Sep 01, 1999 at 09:08:45AM -0400, Kevin Street wrote: > "William R. Somsky" <[EMAIL PROTECTED]> writes: > > > Hmm... but what about if you're cvsup-ing the sources? > > I'm cvsup-ing stable, not current, (cvsup file included below) > > and $FreeBSD appears all over the place unexpanded. Is this > > the way it's supposed to be? Isn't cvsup supposed to be > > (effectively) doing a "check-out"? Or am I just confused? > > > > #] grep src/bin/echo bin/echo/echo.[1c] > > bin/echo/echo.1:.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 >peter Exp $ > > bin/echo/echo.c: "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12:20 >peter Exp $"; > > > > So... no expansion of $FreeBSD that I can see here... > > Those are the expanded tags. When I said I had unexpanded tags, I > meant that I was seeing just: > "$FreeBSD$" > instead of: > "$FreeBSD: $" Oh, ok, so I _was_ confused. Thanks! Occupational hazard of being a physicist: I try to understand things -- and that's when you find out what you _don't_ know. :-) William R. Somsky [EMAIL PROTECTED] Physicist, Baritone, Guitarist http://www.halcyon.com/wrsomsky To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
Peter Wemm writes: >Make sure you are fetching src-all, and if you are not getting src-anything, >then either get src-base or set up $CVSROOT/CVSROOT/options to this: > >23> cat /home/ncvs/CVSROOT/options >tag=FreeBSD=CVSHeader >tagexpand=iFreeBSD,Id > >Fetching src-base will do this for you, as well as getting the modules files >and the commit logs. Yes, that was my problem. I was fetching src-all but into a subdir. I have my own CVSROOT for the rest of my cvs repository and needed to pick up the options file from FreeBSD's CVSROOT. In William's case he does not need to do anything. He's CVSuping in checkout mode and things are already working correctly. -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
Kevin Street wrote: > "William R. Somsky" <[EMAIL PROTECTED]> writes: > > > Hmm... but what about if you're cvsup-ing the sources? > > I'm cvsup-ing stable, not current, (cvsup file included below) > > and $FreeBSD appears all over the place unexpanded. Is this > > the way it's supposed to be? Isn't cvsup supposed to be > > (effectively) doing a "check-out"? Or am I just confused? > > > > #] grep src/bin/echo bin/echo/echo.[1c] > > bin/echo/echo.1:.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:1 2:19 peter Exp $ > > bin/echo/echo.c: "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12 :20 peter Exp $"; > > > > So... no expansion of $FreeBSD that I can see here... > > Those are the expanded tags. When I said I had unexpanded tags, I > meant that I was seeing just: > "$FreeBSD$" > instead of: > "$FreeBSD: $" Make sure you are fetching src-all, and if you are not getting src-anything, then either get src-base or set up $CVSROOT/CVSROOT/options to this: 23> cat /home/ncvs/CVSROOT/options tag=FreeBSD=CVSHeader tagexpand=iFreeBSD,Id Fetching src-base will do this for you, as well as getting the modules files and the commit logs. Cheers, -Peter To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
"William R. Somsky" <[EMAIL PROTECTED]> writes: > Hmm... but what about if you're cvsup-ing the sources? > I'm cvsup-ing stable, not current, (cvsup file included below) > and $FreeBSD appears all over the place unexpanded. Is this > the way it's supposed to be? Isn't cvsup supposed to be > (effectively) doing a "check-out"? Or am I just confused? > #] grep src/bin/echo bin/echo/echo.[1c] > bin/echo/echo.1:.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 >peter Exp $ > bin/echo/echo.c: "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12:20 peter >Exp $"; > So... no expansion of $FreeBSD that I can see here... Those are the expanded tags. When I said I had unexpanded tags, I meant that I was seeing just: "$FreeBSD$" instead of: "$FreeBSD: $" -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
On Sun, Aug 29, 1999 at 09:37:51PM -0700, John Polstra wrote: > > Expansion of RCS keywords occurs on check_out_, not on checkin. In > other words, your cvs is responsible for expanding them. > Hmm... but what about if you're cvsup-ing the sources? I'm cvsup-ing stable, not current, (cvsup file included below) and $FreeBSD appears all over the place unexpanded. Is this the way it's supposed to be? Isn't cvsup supposed to be (effectively) doing a "check-out"? Or am I just confused? = cvsupfile = *defaulthost=cvsup2.FreeBSD.org *defaultbase=/usr *defaultprefix=/usr *defaultrelease=cvs use-rel-suffix *defaultdelete compress *defaulttag=RELENG_3 src-all src-crypto src-secure ports-all tag=. = cvsup -v = CVSup client, GUI version Software version: REL_16_0 Protocol version: 16.0 http://www.polstra.com/projects/freeware/CVSup/ Report problems to [EMAIL PROTECTED] = behavior = #] cd /usr/src #] rm bin/echo/echo.c #] date >> bin/echo/echo.1 #] make update -- >>> Running /usr/local/bin/cvsup -- Parsing supfile "/etc/cvsupfile" Looking up address of cvsup2.FreeBSD.org Connecting to cvsup2.FreeBSD.org Connected to cvsup2.FreeBSD.org Server software version: REL_16_0 Negotiating file attribute support Exchanging collection information Establishing multiplexed-mode data connection Running Updating collection src-all/cvs Checkout src/bin/echo/echo.1 Checkout src/bin/echo/echo.c ^CCleaning up ... #] grep src/bin/echo bin/echo/echo.[1c] bin/echo/echo.1:.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 peter Exp $ bin/echo/echo.c: "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12:20 peter Exp $"; = = So... no expansion of $FreeBSD that I can see here... Am I just confused? William R. Somsky [EMAIL PROTECTED] Physicist, Baritone, Guitarist http://www.halcyon.com/wrsomsky To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
> Rodney W. Grimes writes:
>
> >What verion of the cvs binary are you running (cvs -v)?
>
> Concurrent Versions System (CVS) 1.10 `Halibut' (client/server)
>
> >Are you getting a copy of CVSROOT?
>
> yes...as part of src-all, but it's not used as *my* CVSROOT.
What is the content of *your* CVSROOT/options file?
> Let's go back to the beginning here. Is my cvs responsible for
> expanding the $FreeBSD$ tags, or are they supposed to arrive in my cvs
> repository already expanded?
Your cvs is responsible for expanding the $FreeBSD$ tag when it needs
expanded.
> If my cvs needs to do it, then I presume
> I need to add some options to my CVSROOT to make that happen. If so,
> is there a description somewhere of what I need to steal out of
> FreeBSD's CVSROOT that will make it happen?
The file CVSROOT/options should contain:
gndrsh:root {743}# cat options
tag=FreeBSD=CVSHeader
tagexpand=iFreeBSD,Id
gndrsh:root {744}#
--
Rod Grimes - KD7CAX - (RWG25)[EMAIL PROTECTED]
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
John Polstra <[EMAIL PROTECTED]> writes: > Kevin Street wrote: > Expansion of RCS keywords occurs on check_out_, not on checkin. In > other words, your cvs is responsible for expanding them. > > > If my cvs needs to do it, then I presume > > I need to add some options to my CVSROOT to make that happen. If so, > > is there a description somewhere of what I need to steal out of > > FreeBSD's CVSROOT that will make it happen? > > Grab the "options" file from there. There were actually two things I needed to do. Copy the `options' file from FreeBSD's CVSROOT and add a line saying "options" to the `checkoutlist' file so the options file is kept checked out in CVSROOT. I needed to "cvs co" the src tree again since "cvs update" thought everything was already up to date. Thanks John & Rod. -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
Kevin Street wrote: >>Are you getting a copy of CVSROOT? > > yes...as part of src-all, but it's not used as *my* CVSROOT. Aha. > Let's go back to the beginning here. Is my cvs responsible for > expanding the $FreeBSD$ tags, or are they supposed to arrive in my cvs > repository already expanded? Expansion of RCS keywords occurs on check_out_, not on checkin. In other words, your cvs is responsible for expanding them. > If my cvs needs to do it, then I presume > I need to add some options to my CVSROOT to make that happen. If so, > is there a description somewhere of what I need to steal out of > FreeBSD's CVSROOT that will make it happen? Grab the "options" file from there. John --- John Polstra [EMAIL PROTECTED] John D. Polstra & Co., Inc.Seattle, Washington USA "No matter how cynical I get, I just can't keep up."-- Nora Ephron To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
Rodney W. Grimes writes: >What verion of the cvs binary are you running (cvs -v)? Concurrent Versions System (CVS) 1.10 `Halibut' (client/server) >Are you getting a copy of CVSROOT? yes...as part of src-all, but it's not used as *my* CVSROOT. Let's go back to the beginning here. Is my cvs responsible for expanding the $FreeBSD$ tags, or are they supposed to arrive in my cvs repository already expanded? If my cvs needs to do it, then I presume I need to add some options to my CVSROOT to make that happen. If so, is there a description somewhere of what I need to steal out of FreeBSD's CVSROOT that will make it happen? -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
> John Polstra <[EMAIL PROTECTED]> writes: > > > The tags are expanding just fine up here in Seattle. :-) > > > > I wish you would have included the rest of the output from your cvs > > status command. It sounds a lot like your source tree was checked > > out with "-ko". That would show up in the "Sticky Tag" line of your > > cvs status output. > Are you getting a copy of CVSROOT? What verion of the cvs binary are you running (cvs -v)? -- Rod Grimes - KD7CAX - (RWG25)[EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
John Polstra <[EMAIL PROTECTED]> writes: > The tags are expanding just fine up here in Seattle. :-) > > I wish you would have included the rest of the output from your cvs > status command. It sounds a lot like your source tree was checked > out with "-ko". That would show up in the "Sticky Tag" line of your > cvs status output. === File: umap.hStatus: Up-to-date Working revision:1.11Sun Aug 29 09:54:16 1999 Repository revision: 1.11 /usr/home/cvs/cvsroot/freebsd/src/sys/miscfs/umapfs/umap.h,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) > Do another cvs update, but this time add the "-A" flag: > > cvs update -A umap.h I did check for sticky things before I posted, but just to be safe, I've tried the line above and also tried a full "cvs co" of the entire src tree. Neither helped. I took a look at what I've got in my cvs repository and it's wrong in there, so cvsup isn't getting the right stuff from the server in the first place, or it isn't updating my local cvs repository correctly. CVSup client, GUI version Software version: REL_16_0 Protocol version: 16.0 My first cvsup after the tags went in was from cvsup.ca.FreeBSD.ORG. I've done a few from cvsup.FreeBSD.org to see if it would sort itself out. I think I'll try to get a new copy of part of the tree from scratch and see if it's any different. -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: $FreeBSD tag confusion
In article <[EMAIL PROTECTED]>, Kevin Street <[EMAIL PROTECTED]> wrote: > I'm confused by what I'm seeing in my source tree after the > Id->FreeBSD tag change. I cvsup the repository and then update my > source tree locally. Most of the files in the tree now have an > unexpanded $FreeBSD$ tag in them (ie. no version info). Files which > have been changed since the new tag went in get an expanded $FreeBSD: > tag, but the version in the tag is not the same version as the checked > out file should be. The contents of the file seem to really be the > latest version though, other than the tag. > > For example in /usr/src/sys/miscfs/umapfs "cvs status umap.h" gives: > === > File: umap.hStatus: Up-to-date > > Working revision:1.11Sun Aug 29 19:31:44 1999 > Repository revision: 1.11... > > but in the file I see: > * $FreeBSD: src/sys/miscfs/umapfs/umap.h,v 1.10 1999/08/28 00:47:00 peter Exp $ > > so the $FreeBSD tag in the file is one version behind the version of > the currently checked out file. Deleting and doing "cvs up umap.h" > leaves me in the same state. > > Any explanations as to what's going on? The tags are expanding just fine up here in Seattle. :-) I wish you would have included the rest of the output from your cvs status command. It sounds a lot like your source tree was checked out with "-ko". That would show up in the "Sticky Tag" line of your cvs status output. Do another cvs update, but this time add the "-A" flag: cvs update -A umap.h If that fixes it, then you'd better do the same thing to the rest of your source tree: cd /usr/src cvs update -APd John -- John Polstra [EMAIL PROTECTED] John D. Polstra & Co., Inc.Seattle, Washington USA "No matter how cynical I get, I just can't keep up."-- Nora Ephron To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
$FreeBSD tag confusion
I'm confused by what I'm seeing in my source tree after the Id->FreeBSD tag change. I cvsup the repository and then update my source tree locally. Most of the files in the tree now have an unexpanded $FreeBSD$ tag in them (ie. no version info). Files which have been changed since the new tag went in get an expanded $FreeBSD: tag, but the version in the tag is not the same version as the checked out file should be. The contents of the file seem to really be the latest version though, other than the tag. For example in /usr/src/sys/miscfs/umapfs "cvs status umap.h" gives: === File: umap.hStatus: Up-to-date Working revision:1.11Sun Aug 29 19:31:44 1999 Repository revision: 1.11... but in the file I see: * $FreeBSD: src/sys/miscfs/umapfs/umap.h,v 1.10 1999/08/28 00:47:00 peter Exp $ so the $FreeBSD tag in the file is one version behind the version of the currently checked out file. Deleting and doing "cvs up umap.h" leaves me in the same state. Any explanations as to what's going on? -- Kevin Street [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
