Re: Unable to add new files after checking out a tag
b_dompe [EMAIL PROTECTED] writes: This seems to work for existing files. However, when people try to add a new file to the repository, they get the error cannot add file on non-branch tag releasename. The error message is telling you what you need to know; read the CVS manual about branch. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: checking for ssh-agent in pcl-cvs
Stefan Monnier [EMAIL PROTECTED] writes: I use cvs over ssh under ssh-agent for some of my repositories, and I sometimes try to start cvs-examine without first starting emacs under ssh-agent, which just hangs forever. This is a patch that checks for ssh-agent first, if necessary. Thank you. In what kind of circumstance exactly does it hang ? If I have not started Emacs under ssh-agent, or if I have not done ssh-add. Is it under W32 or X or a tty ? W32 and X. Well, under Windows NT and Linux, ssh eventually times out and I get a broken pipe from server or some such error message. Under Win95 and Win98, it just hangs forever; I have to reboot to get things fully cleaned up. Hence I finally got motivated to do this fix. What does the *cvs-tmp* buffer contain at that point ? I haven't checked. And only ssh hangs, right ? Not Emacs ? Right, just ssh and the cvs process waiting for it. Emacs is ok. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
checking for ssh-agent in pcl-cvs
I use cvs over ssh under ssh-agent for some of my repositories, and I sometimes try to start cvs-examine without first starting emacs under ssh-agent, which just hangs forever. This is a patch that checks for ssh-agent first, if necessary. (defun cvs-check-ssh () Throw an error if we should be running under ssh-agent, but aren't. (let ((default-directory directory)) (if (and (string-match :ext: (cvs-get-cvsroot)) (equal ssh (getenv CVS_RSH)) (not (getenv SSH_AGENT_PID))) (error not running under ssh-agent ;; Add cvs-pre-examine-hook, for cvs-check-ssh (defcustom cvs-pre-examine-hook 'cvs-check-ssh Hook run by cvs-examine, after prompting for directory and flags, before running cvs update. :group 'pcl-cvs :type '(hook :options (cvs-check-ssh))) (defun cvs-examine (directory flags optional noshow) Run a `cvs -n update' in the specified DIRECTORY. That is, check what needs to be done, but don't change the disc. Feed the output to a *cvs* buffer and run `cvs-mode' on it. With a prefix argument, prompt for a directory and cvs FLAGS to use. A prefix arg 8 (ex: \\[universal-argument] \\[universal-argument]), prevents reuse of an existing *cvs* buffer. Optional argument NOSHOW if non-nil means not to display the buffer. (interactive (list (cvs-query-directory CVS Examine (directory): ) (cvs-flags-query 'cvs-update-flags cvs -n update flags))) (when (eq flags t) (setf flags (cvs-flags-query 'cvs-update-flags nil 'noquery))) (run-hooks cvs-pre-examine-hook) (cvs-cmd-do update directory flags nil ( (prefix-numeric-value current-prefix-arg) 8) :cvsargs '(-n) :noshow noshow :dont-change-disc t)) -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: PROPOSAL: Addressing the list's spam issue: was: [GB2312]±ÜÃâåeÎóµÄÍâÙQÐÐäN·½Ê
R P Herrold [EMAIL PROTECTED] writes: snip Proposal: I propose to undertake to offer to moderate. If so designated, in moderating, my moderation will initially consist of turning on the option to catch and hold, pending discard, all non-subscriber posts. I seek to manage held posts at least daily, often a couple times during the day (a subscriber's posts would continue to go straight thru ...) Sounds great. All HTML, non-English (within the bounds of non-English speakers' good faith efforts), and spam will be silently discarded. Sounds great. Posters who post non-conformant meeting the foregoing criteria will be silently unsubscribed. This bothers me. Newbies will often post from an html mailer (like Outlook or the latest Netscape). I'd rather they get a warning/notice that the list only accepts non-html mail, and possibly hints on how to disable html, rather than being silently unsubscribed. Maybe they get three strikes? But if that's not easy to set up, let them read the welcome note again :). -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Update -A on WD from branch
Jeeva Sarma [EMAIL PROTECTED] writes: Hi Guess my earlier question was confusing. I wanted to know how to commit from a working directory checked out from a tag(ordinary tag, not branch tag),but which is made on a branch.How do I get rid of the sticky tag in this case?And then how do I commit? Do you want to commit to the branch, or to the main trunk? If to the trunk, use update -A, then commit. In this case your local files will be merged with the main trunk. If to the branch, use update -r branch, then commit. In this case your local files will be merged with the branch. See the info node accessing branches. Make a backup, and experiment! -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: english text only?
[EMAIL PROTECTED] (Greg A. Woods) writes: [ On Thursday, March 21, 2002 at 01:14:22 (GMT), Stephen Leake wrote: ] Subject: Re: english text only? Can you say why? I read email and new with Emacs Gnus, and I can't tell the difference between the email and the news; they are all just groups. What news reader software have you tried, and not liked? GNUS is way to huge, way too slow, and way to horrible to use for e-mail. Maybe in the past, but not these days. (without expert tuning it's also way too dangerous -- desiring by default to do stupid and dangerous things like interpret HTML) That's true, if you also have w3 installed. Can be turned off. I like it for news though -- it's easier for me these days than the baroqueness of 'trn', which was once my favourite newsreader, and 'rn' was what I used before that. I've used 'tin' a fair bit, but I don't like it that much. Well, if you like it for news, you aught to like it for mail, since it's the same! I've been reading e-mail with ViewMail for nearly a decade I think (my earliest CVS repo for the vm source started 1994/03/28, but I'm reasonably certain I started using VM daily well before that, even while I still used mailx, Mail, and mostly 'mush' a lot). It is definitely painful to change away from something with that much history :). -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Problem
MAO,MARVIN (HP-SanDiego,ex1) [EMAIL PROTECTED] writes: Hi Everyone, Has anyone had this kind of problem with WinCVS when checking in? cvs commit -m no message Driver.cpp (in directory L:\IDPrinting\VCD\R80-E\Source\oceania\HPDJ9x\) cvs commit: sticky tag `OEM_Driver_Release_1_0' for file `Driver.cpp' is not a branch cvs [commit aborted]: correct above errors first! *CVS exited normally with code 1* This means you checked out a tag that is not a branch; something like cvs checkout -r foo MyModule You need to either checkout the main trunk: cvs checkout MyModule or create a branch tag, and check that out: cvs tag -r foo -b branch_foo cvs checkout -r branch_foo Hmm, with WinCVS you have to put those command line args in the dialog boxes somewhere; hope you can figure that out. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: missing tags
Mirco Bova [EMAIL PROTECTED] writes: Hi all, I've just dome my first checkout of a specific revision (ie TAG). All went well but I noticed that some subdirs of the project root were tagged while other aren't. Looking at the files they seem to be all tagged... Here you say all the files are tagged properly. What, exactly do you mean when you say subdirs are tagged? CVS only applies tags to files, not directories (that's one of the features/problems with CVS compared to other tools). Now can anyone tell me what happened? I cannot figure out why only some dirctories are tagged I'd expect to find all the files and folders marked with the tag I selected at checkout time. Here you say some files are not tagged properly. I'm confused. The normal process for using tags is: Get your working directory to the point where you want to tag it. Make sure everything is checked in cvs tag -c tag_foo Delete your working directory (or move it somewhere, to be really safe). cvs checkout -r tag_foo -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: english text only?
Mark A. Flacy [EMAIL PROTECTED] writes: List? What list? I'm reading this in the newsgroup gnu.cvs.help. Which suggests a solution; eliminate the mailing list, and let everyone read this as a newsgroup. Newsgroups get much less spam. How many people reading this have mail access, but not newsgroup access? -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS and Perl
Matthew Persico [EMAIL PROTECTED] writes: Yes, we should all be using tags. However, it is much safer to do ## WARNING, UNTESTED CODE FROM MEMORY::: ($VERSION) = '$Revision$ =~ s/\$Revision: (.*)\$/$1/; or something like that than remember to update the number each time you release a Perl module since $VERSION is a critical part of 'make dist'. And 1.1.1.1 is a bad number for Perl versions. It's not a showstopper, it is just annoying. I don't think this is safer, I think it is simpler. However, things should be a simple as possible, but no simpler! I keep a text file called release_process.text, that lists all the things to do when I do a release. Think of it as a shell script run by the Matthew processor :). It has a lot more in it than bump version number! -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs should ignore certain directories
Moritz Sinn [EMAIL PROTECTED] writes: yes, i'm using the command line and i'm running GNU/Linux so i can't use WinCVS, but i'll try some front-ends. Command line Gnu cvs honours the .cvsignore file. If you have already checked in a file in the cache directory once, then CVS does not ignore it. You have to manually delete it from the repository (yes, in CVSROOT). -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Develop on branch or mainline...
Matthew Persico [EMAIL PROTECTED] writes: Wim Kerkhoff [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED]... What most people suggest to develop on the mainline. Fixes for past releases, expiremental development, and so on are done on branches, then merged back to the mainline as appropriate. But what if I have released 1.7, commited 1.8 and 1.9 but not released them and need to fix 1.7. Can I create 1.7.1.1 if 1.8 exists? Yes. The best policy is to create a branch tag (tag -b) for each release, just in case you need to go back and patch it. If you have a plain tag, you can create a branch tag with tag -b -rplain_tag branch_tag If you have no tag for the release, you'll have to use dates, or somehow figure out the revision number for each file, and branch tag them individually. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: english text only?
[EMAIL PROTECTED] writes: From: [EMAIL PROTECTED] (Greg A. Woods) Date: Wed, 20 Mar 2002 16:29:23 -0500 (EST) [...] How many people reading this have mail access, but not newsgroup access? Count me out. Me too. Newsgroups, in my experience, are awash in spam, Ok. My experience differs, but we've probably been reading different groups. info-cvs is the first mailing list/newsgroup I've encountered that gets so much spam, so I've been blaming it on the mailing list side. and just too bloody much of a pain. pain in what way? Your newsreader is not as friendly as your mail reader? There are better ones out there! Netscape newsreader is pretty good; I prefer Emacs Gnus. If info-cvs becomes news-only, I'll just bail on it. I've set up a redistributor for info-cvs which runs on my home machine. It does a fair job of filtering the crap, and is getting progressively better as I refine my filters. If there's interest, I can open it up to general subscription, and whose who care about a spam-limited info-cvs list can subscribe that way. I'd like to see your list of filters, so I can add them to my Gnus setup. I'd rather rely on the news servers than your mail server. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: english text only?
[EMAIL PROTECTED] (Greg A. Woods) writes: [ On Wednesday, March 20, 2002 at 15:24:35 (GMT), Stephen Leake wrote: ] Subject: Re: english text only? Which suggests a solution; eliminate the mailing list, and let everyone read this as a newsgroup. Newsgroups get much less spam. The newsgroup won't get less spam unless you can convince gnu.org to actually delete the mailing list and thus shut down the gateway, while at the same time keeping the newsgroup. Which is what eliminate the mailing list means. How many people reading this have mail access, but not newsgroup access? Count me out. I don't do news much any more -- e-mail is far easier for me to handle. Can you say why? I read email and new with Emacs Gnus, and I can't tell the difference between the email and the news; they are all just groups. What news reader software have you tried, and not liked? I'll stay on the list and continue to campaign for subscriber-only access (which will at least kill half the spam or more). Will subscriber-only access allow me to post via the newsgroup? -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Help I'm trying to set up CVS with SSH
Jerry Hancock [EMAIL PROTECTED] writes: I have a Shell account at my ISP where I have the latest version of CVS. I'm assuming that there is not a process that needs to be started. I have the wincvs client as detailed in the following doc. http://www.devguy.com/fp/cfgmgmt/cvs/cvs_ssh.htm I get the following responce in the wincvw dialog when trying to create a repository. cvs init: warning: unrecognized responce '[EMAIL PROTECTED]'s password: The server is prompting for a password. You need to implement on of the solutions from devguy to get a password-less configuration. Which one did you try? -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: adding binary file
Marcus Crafter [EMAIL PROTECTED] writes: On Mon, Mar 11, 2002 at 10:47:57AM +0100, Etienne SOBOLE wrote: Is there a option to let CVS decide if the file is a text file or a binary file. Not that I'm aware of, I think you have to supply the -kb option. The 'cvswrappers' file lets you specify wildcards that match filenames that should be binary. See the CVS info topic The cvswrappers file (goto node 'wrappers'). -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: avoid ^M when committing to Unix based repository
Mika Lehtonen [EMAIL PROTECTED] writes: Hi! I'm using WinCvs version 1.2. The repository is located in a Unix machine. When I have edited some lines the lines edited has the ^M added after being comitted back to the repository. You have to use an editor that knows not to use DOS line endings. Most programmer's editors can be configured that way. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Please help with merge!!!!!
Andy Mayer [EMAIL PROTECTED] writes: On Sat, 09 Mar 2002 03:57:05 +, Stephen Leake wrote: I don't think CVS can do that. You are talking about managing change sets. Then what is chapter 13 of the CVS manual all about? It says there If you modify a program to better fit your site, you probably want to include your modifications when the next release of the program arrives. CVS can help you with this task. Good. Learn something new every day :). I think that chapter wasn't there the first time I read the CVS manual (getting longer ago every day :). I'll have to try this. I handle this process by keeping a diff file of my changes to vendor's code, and applying it to each new release (outside of CVS). Could you please explain this process a little more? Well, I think I'm just doing manually what CVS does with branches and merging. Here's the process: 1) Unpack the vendor's version 1.0 distribution twice; one clean copy, one I will modify. 2) Make my modifications. 3) Run 'diff' to get a single diff file showing all my modifications. Now, when Vendor version 2.0 comes along: 1) Unpack Vendor version 2.0 twice. 2) Run 'patch' to apply my version 1.0 changes to version 2.0. 3) Make more changes. 4) Run 'diff' to make a version 2.0 patch file. This process is simpler than CVS when the vendor package is huge and my local changes are small - a typical situation. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (no subject)
Monica Larsson [EMAIL PROTECTED] writes: Hallo! Can I achive a directory in WinCvs, where some users have full access and can checkout and commit files, some users just can checkout but not commit, and some users dont have access to this directory at all. I know about unixgroups, and directory permissions, but is there other solutions? Assuming you are using a Unix server, what is wrong with Unix groups? They are designed specifically for this situation. Note that you need to use the LockDir option in the CVSROOT/config file to get read-only directories. -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Please help with merge!!!!!
Andy Mayer [EMAIL PROTECTED] writes: Hi, Problem: I want to merge the vendor's new release (R2) with my customisations to the previous release (R1). snip How do I make CVS keep my original changes to R1, but take the vendor's new changes to R2? I don't think CVS can do that. You are talking about managing change sets. I handle this process by keeping a diff file of my changes to vendor's code, and applying it to each new release (outside of CVS). -- -- Stephe ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
