checking out and branches
Hi, I made a minor goof up during one of my WinCVS sessions. I wanted to retrieve the trunk of one particular file from the repository. But, unfortunately, WinCVS checked out that particular revision for ALL my files. So that left me with less than the number of files I had originally. No biggy. I went and deleted the working directory and did a brand new check-out. It didn't come out as I had planned as the checkout didn't checkout the particular versions from the branches that I was editing. But if I specify a branch, WinCVS removes the rest of the files from the working directory. How do I check out the branch revisions of some files while checking out the main trunk of other files during a checkout of the whole repository? While I'm on the topic of branches, I took a look at the graph of some of my files and noticed(not surprisingly) that I had branched the files and made the modifications within the branches. So right now, I have a few files with a short main trunk and a long branch. Under this circumstance, should I just flatten the system so that it's just one main trunk? Do I just merge the branch with the main trunk? In the help file, there was the assumption that I continued adding code to the main trunk(which isn't the case here), so I don't know if the same merge command would apply since the main-trunk merge point (in my case) is the branch-point(where it branches out) as well. I don't want to screw up my repository that much, so I'll wait for any clarifications in this matter. Any help appreciated. Thanks. Edmund ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
intelligent binary/text detection
I'm playing with TortoiseCVS. When adding a new module, it nicely autodetects binary files vs. text files for add'ing, and prompts when it can't tell. Has anyone already written a script that will do this under linux? I need to check in a big tree of vendor and custom source. Some is binary. I hesitate to move it to a Windows machine and do the initial check-in via TortoiseCVS. Thus I'd like a nice script to check it in on the server. Phil ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: intelligent binary/text detection
Phil R Lawrence writes: I'm playing with TortoiseCVS. When adding a new module, it nicely autodetects binary files vs. text files for add'ing, and prompts when it can't tell. Has anyone already written a script that will do this under linux? I need to check in a big tree of vendor and custom source. Some is binary. I hesitate to move it to a Windows machine and do the initial check-in via TortoiseCVS. Thus I'd like a nice script to check it in on the server. Autodetection, while convenient, is not infallible; you really need to determine for yourself which files are text and which are binary. Linux, like Unix, does not differentiate between text and binary files. Thus, it is sufficient to import the tree with a best guess wrapper to specify which files are likely to be binary and then fix up any problems afterwards with cvs admin -k. -Larry Jones How many presents do you think I'd forfeit for just one clean smack upside Susie's head? -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Empty val-tags file
Fabian Cenedese writes: cvs.exe -t update -rVERSION15 VarioSam/Applicat/Src/Iologger.cpp - main loop with CVSROOT=:local:n:/temp/variosam cvs.exe [update aborted]: no such tag VERSION15 I'm clueless at this point. Just out of curiosity, does it make any difference if you run the command in the directory containing the file rather than using a path name in the command? That is: cd VarioSam/Applicat/Src cvs update -rVERSION15 Iologger.cpp -Larry Jones It must be sad being a species with so little imagination. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Empty val-tags file
Fabian Cenedese writes: Guess what, it worked a lot better. And also the val-tags file was updated after this command. Then I went back to N:\Temp\vs\VarioSam, so still inside the module, this also worked. But going back one step to N:\Temp\vs and specifying full module path (VarioSam is the module) it failed again. Thanks, those are valuable data points. I'll have to take a closer look at the code and see if I can figure out what's going wrong. The CVSROOT _was_ set with forward slashes, cvs itself changed them to backslashes again. No it didn't. It was using the stored root from some CVS/Root file that contains backslashes. -Larry Jones Physical education is what you learn from having your face in someone's armpit right before lunch. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVSROOT/cvsignore
I can't get the $CVSROOT/CVSROOT/cvsignore file to work correctly (what I think it should do :)). I put a single line entry with vssver.scc on it to keep these files from importing (we're migrating some projects from Visual SourceSafe), but they get importedand/or recognized as unknown files anyway. I really didn't want to have to include .cvsignore files in multiple subdirectories. Can you help me understand what I'm doing wrong? Thx CaryCoulter ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs server:Up-to-date check failed for 'team/test/MyTest.java'
Mike Ayers writes: There is no CVS 1.11.3.1 - current version is 1.11.2, with 1.11.3 impending. ... I'm a little confused here. Vanilla CVS does not have messageboxes. What platform is this? This would most probably be CVSNT 1.11.1.3 (not .3.1) and WinCVS. Satheesh: there is a also newsgroup and mailing list devoted to cvsnt specifically. (Look it up at http://www.cvsnt.org - look for Mailing Lists). ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Security options
Yesterday we were discussing the following set-up: - user account 'phil' - user account 'cvs-phil' with shell /sbin/nologin - cvs-phil has group rights to modify projects - SSH configuration allows cvs-phil only to run cvs As Mark pointed out, /sbin/nologin prevents phil (or anyone else) from su'ing to cvs-phil. However, it also prevents an SSH connection, which causes an error when using cvs: cvs update: warning: unrecognized response `This account is currently not available.' from cvs server My best idea is to leave cvs-phil with a regular shell, but disallow su'ing to cvs-phil (via chuser on AIX, but how about linux?). Since our server will be physically secured, no one could directly log onto the console as cvs-phil. Then SSH will be configured to only allow the cvs command. Any other thoughts? Thanks, Phil ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Security options
On Thu, 19 Dec 2002, Phil R Lawrence wrote: My best idea is to leave cvs-phil with a regular shell, but disallow su'ing to cvs-phil (via chuser on AIX, but how about linux?). Since our server will be physically secured, no one could directly log onto the console as cvs-phil. Then SSH will be configured to only allow the cvs command. Any other thoughts? You can write a shell script which serves as the user's login shell. That script can do arbitrary filtering to allow or disallow commands. I had one such a script that would allow CVS access, but only to a specified repository. It filtered out any -d option, and put in its own. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
(newbie) Which is the actual cvsroot?/remote repository access
Hello, 1.) Using Linux (Redhat 8.0) I set up a cvs repository at /usr/local/cvsroot. That created a subdirectory named CVSROOT underneath it. Now, whenever a command requests the path to CVS root (e.g., in setting up xinetd pserver service, checkout/update commands, etc.)--I'm confused which directory CVS considers as the root: /usr/local/cvsroot or /usr/local/cvsroot/CVSROOT? 2.) Also, in trying to access a Linux CVS server from Windows NT, do I need WinCVS or another CVS client on my NT machine if using pserver authentication? (I would like to do CVS commands using Ant--I installed WinCVS, but I think WinCVS may be unnecessary for my purposes.) Thanks, Glen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (newbie) Which is the actual cvsroot?/remote repository access
On Thu, Dec 19, 2002 at 04:28:43PM -0500, Mazza, Glen R., ,CPMS wrote: I'm confused which directory CVS considers as the root: /usr/local/cvsroot or /usr/local/cvsroot/CVSROOT? /usr/local/cvsroot -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Just Say No to the faceless cannonfodder stereotype. - http://www.ainurin.net/ (an Orc site) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (newbie) Which is the actual cvsroot?/remote repository access
Mazza, Glen R., ,CPMS writes: 1.) Using Linux (Redhat 8.0) I set up a cvs repository at /usr/local/cvsroot. That created a subdirectory named CVSROOT underneath it. Now, whenever a command requests the path to CVS root (e.g., in setting up xinetd pserver service, checkout/update commands, etc.)--I'm confused which directory CVS considers as the root: /usr/local/cvsroot or /usr/local/cvsroot/CVSROOT? /usr/local/cvsroot. CVSROOT is a top-level module in the repository where CVS stores its administrative files that is created automagically when you initialize the repository. Other than the automagic creation, it's no different than any other top-level module. 2.) Also, in trying to access a Linux CVS server from Windows NT, do I need WinCVS or another CVS client on my NT machine if using pserver authentication? (I would like to do CVS commands using Ant--I installed WinCVS, but I think WinCVS may be unnecessary for my purposes.) Yes, you need some kind of CVS client. -Larry Jones What better way to spend one's freedom than eating chocolate cereal and watching cartoons! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (newbie) Which is the actual cvsroot?/remote repository access
On Thu, 19 Dec 2002, Mazza, Glen R., ,CPMS wrote: 1.) Using Linux (Redhat 8.0) I set up a cvs repository at /usr/local/cvsroot. That created a subdirectory named CVSROOT underneath it. Now, whenever a command requests the path to CVS root (e.g., in setting up xinetd pserver service, checkout/update commands, etc.)--I'm confused which directory CVS considers as the root: /usr/local/cvsroot or /usr/local/cvsroot/CVSROOT? CVSROOT is actually a directory that contains repository configuration. It can be checked out as a module; changes committed to the files belonging to this module bring about dynamic configuration changes in the repository. It should have been named CVSCONFIG or something else; giving it the same name as that of the CVSROOT environment variable was a crass stupidity that only causes confusion. 2.) Also, in trying to access a Linux CVS server from Windows NT, do I need WinCVS or another CVS client on my NT machine if using pserver authentication? You cannot use a CVS repository without CVS software. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (newbie) Which is the actual cvsroot?/remote repository access
On Thu, Dec 19, 2002 at 04:34:57PM -0500, Larry Jones wrote: Mazza, Glen R., ,CPMS writes: 2.) Also, in trying to access a Linux CVS server from Windows NT, do I need WinCVS or another CVS client on my NT machine if using pserver authentication? (I would like to do CVS commands using Ant--I installed WinCVS, but I think WinCVS may be unnecessary for my purposes.) Yes, you need some kind of CVS client. True, but Ant might *be* a CVS client. I don't know for sure, having never used its CVS support, but it's a good possibility. Unlike make (but like CVS itself :-), Ant tends to slurp into itself any usually-external functionality that might be needed. An Ant mailing list might be a better place to ask about this. -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Just Say No to the faceless cannonfodder stereotype. - http://www.ainurin.net/ (an Orc site) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVSROOT/cvsignore
Cary Coulter writes: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary80217196335194441== Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! I can't get the $CVSROOT/CVSROOT/cvsignore file to work correctly (what I think it should do :)). I put a single line entry with vssver.scc on it to keep these files from importing (we're migrating some projects from Visual SourceSafe), but they get imported and/or recognized as unknown files anyway. I really didn't want to have to include .cvsignore files in multiple subdirectories. It works fine for me -- what version(s) of CVS are you running and on what platform(s)? Local mode or client/server? Are you sure you don't have import -I! in your ~/.cvsrc file? -Larry Jones Hey Doc, for 10 bucks I'll make sure you see those kids in the waiting room again real soon! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: (newbie) Which is the actual cvsroot?/remote repository access
Eric Siegerman writes: True, but Ant might *be* a CVS client. :-). No, it's not. There are Ant cvs tasks, but they work by exec'ing a standalone CVS client. -- Shankar. PS There is a Java CVS client library, however, that's part of NetBeans, and has been used as the basis for other CVS clients as well (e.g. SmartCVS). In theory, it could be integrated into Ant.. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Security setup
Larry Jones wrote: Mike Ayers writes: Let me make sure of this. You're saying that even when running only over ssh, in a jail, with a login shell of cvs, someone can still get shell access? They can't actually get an interactive shell, but unless you criple CVS, they can execute arbitrary commands, which is equivalent. So call me Tanya, hand me a crowbar, and point to the kneecaps! Are we talking crippling by configuration here - disallowing commit scripts and the like? That would be fine, since we want nothing but checkout, checkin, and accounting. Or will I need to do the dirty work inside the codebase, which would be less appealing? TiA, ___ | anya ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
