recovery of erroneously committed file
I have accidentally checked in a Microsoft Word format file as a normal text file, instead of binary. Can I recover this file in its original form, or is it permanently trashed? We use CVS in client/server, with NT4 clients, and server on HP-UX 11. CVS version 1.10.5. Niall _ Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com. Share information about yourself, create your own public profile at http://profiles.msn.com.
Entries format question
I'm finding a case where there's a '=' in the date field of a line in an Entries file when I'm doing a cvs tag. The = is not documented in the Cederqvist as being one of the characters that should show up in the timestamp field. I'm running a taginfo script under pserver that parses the Entries file it finds in the cvs-servpid directory (its current directory when it runs, actually) (more for curiosity at this point--to see what's in there in the tmp directory when a cvs tag happens) and I'm finding a line like this: /theFilename.txt/1.23/=// Cederqvist says, in http://www.loria.fr/~molli/cvs/doc/cvs_2.html#IDX81, paraphrased, that anything that shows up in the timestamp slot that isn't a date/time string means that the file is to be considered modified. Was the '=' picked for any particular reason or is it just there to indicate that theFilename.txt is to be considered as "modified" in some way since the tag operation should complete even if no lines in the file have changed? Cheers, Laird
Taginfo question
Is there any way to determine from within a taginfo script whether the tag being added is a branch tag? I'm inclined to say no--no such information exists in any of the arguments etc. passed to taginfo, in the ,v file or in the environment. Cheers, Laird
Re: Taginfo question
You could create a rule that says branches are all lowercase and non-branch tags are all uppercase. Enforcement could be dictated through a script you write that the users must use to lay tags... donald On Thu, Sep 14, 2000 at 08:50:04AM -0400, Laird Nelson wrote: Is there any way to determine from within a taginfo script whether the tag being added is a branch tag? I'm inclined to say no--no such information exists in any of the arguments etc. passed to taginfo, in the ,v file or in the environment. Cheers, Laird
Taginfo question
Title: Taginfo question I've been looking for this myself, and I believe you are correct. A few weeks ago (in August) one of the OpenAvenue developers posted a patch which provides branch info in taginfo (as well as other information I need in commitinfo, etc.). The patch was for the development version of CVS, not 1.10.8, although a backpatch for 1.10.8 was mentioned. Check the egroups archives for scripting hook patch. Unfortunately I haven't been able to contact the original poster to find out if the backpatch was ever posted anywhere. If anyone knows where the backpatch can be found, I'd appreciate hearing about it. Thanks, Alex -Original Message- From: Laird Nelson [mailto:[EMAIL PROTECTED]] Sent: Thursday, September 14, 2000 7:50 AM To: [EMAIL PROTECTED] Subject: Taginfo question Is there any way to determine from within a taginfo script whether the tag being added is a branch tag? I'm inclined to say no--no such information exists in any of the arguments etc. passed to taginfo, in the ,v file or in the environment. Cheers, Laird
inetd question related to cvs (not usual pserver doesn't work FAQ)
inetd programs are supposed to be able to simply read from STDIN, right? I'm trying to write a wrapper program around cvs pserver that gets invoked, obviously, from STDIN. I'd like to peek at the conversation between client and server, and I thought I could get at this conversation by simply reading from STDIN. But my program blocks infinitely. Is the cvs client/server protocol such that it is started by the server (the Cederqvist says no)? In case it matters, my program is a perl program. Cheers, Laird
Re: Can CVS import directory structure ?
[EMAIL PROTECTED] writes: for example : I have a project as following structure. /project/a /project/a-a /project/b /project/b-a can't I import project ? can't CVS recursively import the subdirectory ? Yes, CVS import is recursive. -Larry Jones I just can't identify with that kind of work ethic. -- Calvin
Re: Taginfo question
Another taginfo question (maybe a bug report).
Cederqvist says that the taginfo script is supposed to get five
arguments: tag, action, directory, file and revision.
But when I do a cvs tag -d someTag someFile.txt I get three: tag
("someTag"), action ("del") and directory ("wherever/someFile/lives").
Is this a bug?
Cheers,
Laird
Re: inetd question related to cvs (not usual pserver doesn't work FAQ)
Laird Nelson writes: inetd programs are supposed to be able to simply read from STDIN, right? I'm trying to write a wrapper program around cvs pserver that gets invoked, obviously, from STDIN. I'd like to peek at the conversation between client and server, and I thought I could get at this conversation by simply reading from STDIN. But my program blocks infinitely. Is the cvs client/server protocol such that it is started by the server (the Cederqvist says no)? I'm not entirely clear on what it is you're doing, but a program started by inetd has the client socket as its STDIN and STDOUT. If you're trying to snoop on the traffic between the client and server, you'll need to create another socket to use to communicate with the cvs pserver and then you have to copy everything you read from STDIN to the pserver and everything you read from the pserver to STDOUT. This needs to happen more-or-less simultaneously to avoid getting stuck in a deadly embrace (e.g., you block trying to write to pserver which is blocked trying to write to you). Note that the simplest way to snoop on the traffic between the client and server if you're just curious is to set the CVS_CLIENT_LOG environment variable on the client side. -Larry Jones He piqued my curiosity. -- Calvin
Re: Entries format question
Laird Nelson writes: I'm finding a case where there's a '=' in the date field of a line in an Entries file when I'm doing a cvs tag. The = is not documented in the Cederqvist as being one of the characters that should show up in the timestamp field. I'm running a taginfo script under pserver that parses the Entries file I think that's the key -- client/server takes some liberties with the Entries file format on the server side; I don't think you'll ever find this in a "real" Entries file. As I recall, it means that the client said that the file was unmodified (via an Unchanged request). There is a bit of information in the client/server protocol manual. -Larry Jones I wonder what's on TV now. -- Calvin
RE: inetd question related to cvs (not usual pserver doesn't work FAQ)
An easier way to look at the pserver client/server dialog is to define the CVS_CLIENT_LOG environment variable with the base file name for the log on the client. The client will create two files. Everything that the client sends to the server is logged in filename.in and everything from the server is in filename.out. This is documented in Cederqvist (http://www.cvshome.org/docs/manual/index.html), specifically in http://www.cvshome.org/docs/manual/cvs_19.html#SEC178 - Tim -Original Message- From: Laird Nelson [mailto:[EMAIL PROTECTED]] Sent: Thursday, September 14, 2000 10:51 AM To: [EMAIL PROTECTED] Subject: inetd question related to cvs (not usual pserver doesn't work FAQ) inetd programs are supposed to be able to simply read from STDIN, right? I'm trying to write a wrapper program around cvs pserver that gets invoked, obviously, from STDIN. I'd like to peek at the conversation between client and server, and I thought I could get at this conversation by simply reading from STDIN. But my program blocks infinitely. Is the cvs client/server protocol such that it is started by the server (the Cederqvist says no)? In case it matters, my program is a perl program. Cheers, Laird
Re: inetd question related to cvs (not usual pserver doesn't workFAQ)
[EMAIL PROTECTED] wrote: An easier way to look at the pserver client/server dialog is to define the CVS_CLIENT_LOG environment variable with the base file name for the log on the client. Yes; thanks. What I'm actually trying to do is harvest some information from the pserver connection that should be exposed to commitinfo and the like (like the -r option to commit--if someone commits a file and says -r 2.4, there's no way to get that 2.4 inside a commitinfo script). If there's a way to get these kinds of things with stock cvs, I'd like to do that. Anyhow, I thought I could sniff a bit of extra information via a server side wrapper and then pass it on (in the environment, perhaps) so my commitinfo scripts could make use of it. Guess I can't really do that. Cheers, Laird
Re: inetd question related to cvs (not usual pserver doesn't workFAQ)
"Laird" == Laird Nelson [EMAIL PROTECTED] writes: Laird [EMAIL PROTECTED] wrote: An easier way to look at the pserver client/server dialog is to define the CVS_CLIENT_LOG environment variable with the base file name for the log on the client. Laird Yes; thanks. What I'm actually trying to do is harvest some information Laird from the pserver connection that should be exposed to commitinfo and the Laird like (like the -r option to commit--if someone commits a file and says Laird -r 2.4, there's no way to get that 2.4 inside a commitinfo script). If Laird there's a way to get these kinds of things with stock cvs, I'd like to Laird do that. Laird Anyhow, I thought I could sniff a bit of extra information via a server Laird side wrapper and then pass it on (in the environment, perhaps) so my Laird commitinfo scripts could make use of it. Guess I can't really do that. A while ago there was a patch (against 1.10.7) by John Cavanaugh which made cvs provide extended information to commitinfo scripts (AlternateInfo). Maybe you might want to check this out (I messed it up - I can't find it anymore). Joerg
SSH and PServer
Hi Everyone, I'm trying to set up pserver on a redhat linux machine that is running ssh. After following the instructions in the gnu manual; I still can't connect using the login command. Can anyone assist or refer me to some documentation that could help? Joanne
Re: Taginfo question
Laird Nelson writes:
Cederqvist says that the taginfo script is supposed to get five
arguments: tag, action, directory, file and revision.
No it doesn't, it says that the taginfo script gets tag, action, and
directory, and that any additional arguments are file/revisions pairs.
The taginfo script only gets called once per directory with all of the
affected files listed. If no files are affected, then there are no
additional arguments.
But when I do a cvs tag -d someTag someFile.txt I get three: tag
("someTag"), action ("del") and directory ("wherever/someFile/lives").
Is this a bug?
No, it means that the file didn't contain the tag, so there was nothing
to delete.
-Larry Jones
My brain is trying to kill me. -- Calvin
RE: Keyword substitution in binary files?
Hey Anders, I have a tool that is capable of performing the substitution, but I know of no way to get the (new) revision number before the file is actually committed. You could run a 'cvs log thefile.doc' prior to substituting and comitting the doc. Of course, you have to make sure that no one else is doing a commit to the same file while you do it, because the log output might be outdated at the time the commit is performed. This though can be done using the lock command (if you really need it). Guus
RE: recovery of erroneously committed file
I have accidentally checked in a Microsoft Word format file as a normal text file, instead of binary. Can I recover this file in its original form, or is it permanently trashed? Two options come to mind: 1) If your file was the first version, get someone to delete the corresponding Repository file, go back to the drawing board and start from scratch. 2) If not, move the file out of your local sandbox, update the previous version (the one just before you comittied), put your copy over it, execute cvs admin -kb on your local file and commit it. Guus
Re: What is Cederqvist?
[ On Tuesday, September 12, 2000 at 15:34:02 (-0700), Craig Saunders wrote: ] Subject: Re: What is Cederqvist? I find this all very amusing because when I suggested that we should have an FAQ (which would include answers to questions like this) I was told by the loud, obnoxious old-timers that we don't need an FAQ - All the answers are in The Cederqvist. Well this old timer really thinks it very very very bad form to refer to something like this by the disembodied name of its creator (and I hope I've never ever used that phrase in any way!). Stupid contractions like this are what create meaningless jargon in the first place. If people want to give credit to Per Cederqvist (credit which he very much deserves I might add!), they should refer to the manual as ``Per Cederqvist's CVS Manual''. As for an FAQ, well when Per Cederqvist wrote the first version of the current CVS manual it was to replace the old FAQ which had become totally and absolutely unwieldy. It was impossible to use yet people were trying to use it in lieu of a proper manual. Indeed a FAQ in the old form should never be necessary in this context. If the documentation for a software package does not answer all questions, frequent and infrequent, in a way that's easy to find and understand then the solution is most definitely not to create a FAQ, especially not in th modern way such FAQs are written from scratch by one person as a unique new document on their own. However a FAQ, of course in the form of a true FAQ which answers questions outside the scope of the manual, of which there was once a half decent one posted monthly to the list, is a different story Often though such FAQs are far more effort than they're worth in this day of web pages and search engines. -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] robohack!woods Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED]
RE: What is Cederqvist?
[ On Tuesday, September 12, 2000 at 17:15:25 (-0700), Tom Werges wrote: ] Subject: RE: What is Cederqvist? In my opinion, referring to a standard document by the last name of its author is not snooty or superior. I suppose that depends on who you are. In my opinion it does very much the opposite of giving credit to the author, especially when used It would be annoying to have to list the full title and author in every reference. In the "real world" this is not considered "annoying" -- it is in fact standard practice both in published writings and in speech. If indeed you wish to refer to the CVS manual without naming it's full title and author then the correct prase would be "the CVS manual". -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] robohack!woods Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED]
Installing tkCVS
I am looking for some documentation on how to install tkCVS Thanks for any and all help!
Recall: Installing tkCVS
Annette Waters would like to recall the message, "Installing tkCVS".
Re: What is Cederqvist?
Greg A Woods [EMAIL PROTECTED] writes: [ On Tuesday, September 12, 2000 at 17:15:25 (-0700), Tom Werges wrote: ] In my opinion, referring to a standard document by the last name of its author is not snooty or superior. I suppose that depends on who you are. In my opinion it does very much the opposite of giving credit to the author, especially when used It's very common practice in academia and has been picked up by some related communities. Consider "Stevens" for _Advanced Programming in the Unix Environment_ or _Unix Network Programming_ depending on context, "Knuth" for _The Art of Computer Programming_, "KR" for _The C Programming Language_, etc. When I was still in school, it was very common to refer to any textbook by the last name of the author, primarily because textbooks often have very normal and undistinctive names. The only way one could keep track of different physics textbooks was by author, for example; otherwise, you end up having to remember if the book was _Physics_, _Elementary Physics_, _Introductory Physics_, _Physics: An Introduction_, or something else that sounds almost the same. -- Russ Allbery ([EMAIL PROTECTED]) http://www.eyrie.org/~eagle/
Re: What is Cederqvist?
From: Jerry Nairn [EMAIL PROTECTED] I agree with most of your comments, but there is a FAQ at: http://www.loria.fr/cgi-bin/molli/fom.cgi Cheers, Jerry Which is not updated with QA from the list nor posted to the mailing list periodically. Also, with a personal bias, I find it difficult to navigate the FAQ-O-MATIC. At one time, I suggested an FAQ built with questions answered on the mailing list. It would reference resources such as the Cederqvist and others. It would be kept on some web site such as the FAQ-O-MATIC so that folks could get it whenever they needed it. It would be posted periodically to the mailing list so that newbies other lurkers would see it go by, hopefully before the asked their own. If Greg thinks it would be a good idea and he (and others) would be willing to forward their answers of FAQ's, I would be willing to edit and compile the FAQ list, post it regularly and keep it on a publicly accessible web site. (I would also scan the mailing list for potential FAQ's and proactively update the FAQ list. And, with a little reluctance, reconcile when old-timers have different opinions on how to answer a question.) That is what I proposed before. That offer is still open. Craig
Cvs diff with multiples files in multiples directories
Hi, I'm working on a CVS source tree where I only have read-only access. So when I do some change I try to produce a patch that could be easily applied. I have a subtree that looks like kernel \---current \---src \---include And I have a modified source(kapi.cxx) and an include (kapi.h) file in src and include In the module directory I type: cvs -q diff -u -r mypatch.txt And the ouput is like this: Index: current/include/kapi.h === RCS file: /cvs/ecos/ecos/packages/kernel/current/include/kapi.h,v retrieving revision 1.9 diff -u -r1.9 kapi.h --- kapi.h 2000/08/25 17:33:31 1.9 +++ kapi.h 2000/09/15 00:42:19 @@ -186,6 +186,15 @@ [ diff output ... ] Index: current/src/common/kapi.cxx === RCS file: /cvs/ecos/ecos/packages/kernel/current/src/common/kapi.cxx,v retrieving revision 1.12 diff -u -r1.12 kapi.cxx --- kapi.cxx2000/08/25 17:33:31 1.12 +++ kapi.cxx2000/09/15 00:42:19 @@ -277,6 +277,10 @@ [ diff output ... ] This seems correct except this: --- kapi.cxx2000/08/25 17:33:31 1.12 +++ kapi.cxx2000/09/15 00:42:19 It should be the full name, like in the Index just above. When I try to apply the patch, it doesn't find the files and I have to type all the files names. I have seen other patchs where there was the full name. How can I have them the full name in the patch output ? I use cvs that came with wincvs (cvs.exe v.1.10.5) and I have the cygwin diff (v 2.7-cygwin-990830) and patch (v2.5). Thanks a lot. -- Fabrice Gautier
Re: SSH and PServer
On Thu, Sep 14, 2000 at 04:25:04PM -0400, Christian, Joanne wrote: I'm trying to set up pserver on a redhat linux machine that is running ssh. Umm... either user pserver or use ssh. (well, you can use ssh tunneling to access pserver, but that's awfully silly). Instead of trying to use pserver, just use standard server mode. Read the sections on using RSH, and just set CVS_RSH to the value ssh. mrc -- Mike Castle Life is like a clock: You can work constantly [EMAIL PROTECTED] and be right all the time, or not work at all www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc We are all of us living in the shadow of Manhattan. -- Watchmen
