Tag/branch question
I've got some difficulty in understanding how to tag dead revisions such that branch merges will work. Consider this: Initial state (version, tag): 1.3 LAST_MERGED 1.4 REL_1 Now merge on some branch: cd branch... cvs up -j LAST_MERGED -j REL_1 cvs rtag -F -r REL_1 LAST_MERGED I get on trunk: 1.3 1.4 REL_1, LAST_MERGED Ok. Now delete the file, commit: cvs rm -f file cvs ci 1.3 1.4 REL_1, LAST_MERGED 1.5 dead How would I have to create tag REL_2 so that a following cvs up -j LAST_MERGED -j REL_2 will delete the file on the branch as well? Obviously, the tags need to be something like 1.3 1.4 REL_1, LAST_MERGED 1.5 REL_2, dead but how to get REL_2 onto the dead rev? cvs tag ... in the sandbox won't find the file anymore. Thanks, Michael ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Regarding check-in of unicode characters.
Hi All, We are trying to check-in the following characters into CVS. But while doing so, the highlighted characters get corrupt and upon checking out, these are replaced by some other characters. Sí (means yes in Spanish) Sì (means yes in Italian) Can anybody provide a solution? Thanks and Regards, Maninder Singh ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Working on sources in parallel
Hello, just recently we had the problem that two people had checked out the same module and were working on it independently. When the second one committed his sources again, CVS reported an error (I can't reproduce it 100% here, sorry) about the sources not being up-to-date. However, I thought that would be exactly what CVS takes care of, in fact making sure that noone has to bother about who else has checked out a version and modifies it, and merges all changes together when committing it back. I haven't seen anything about this issue in the info pages either. Am I missing something? -- Matthias Kaeppler ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Working on sources in parallel
This is intentional by CVS. So here's the scenario Person1 Person2 working on file1.c and hence have a copy of the file in their respective sandbox. Person1 checks-in file1.c, updating the repository copy. Person2 checks in file1.c, CVS complains Your file is out of date (or the like). Person2 has to do a cvs up first to get Person1's changes in his sandbox copy; then Person2 can commit. Without this check, Person2 will overwrite Person1's changes. -chris -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Matthias Kaeppler Sent: Wednesday, June 15, 2005 12:51 PM To: info-cvs@gnu.org Subject: Working on sources in parallel Hello, just recently we had the problem that two people had checked out the same module and were working on it independently. When the second one committed his sources again, CVS reported an error (I can't reproduce it 100% here, sorry) about the sources not being up-to-date. However, I thought that would be exactly what CVS takes care of, in fact making sure that noone has to bother about who else has checked out a version and modifies it, and merges all changes together when committing it back. I haven't seen anything about this issue in the info pages either. Am I missing something? -- Matthias Kaeppler ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Working on sources in parallel
CVS automation kicked in for you. It recognized a concurrent change and instructed you to update your local copy before checking in the changes. Updating before checking in is a sound policy that avoids those errors. Allows you to do a local integration test prior to checking in. You just had a demonstration of why you don't have to worry about concurrent updates: CVS let you know that you need to update automatically. Updating is what does the merge. You can then check in assuming there are no conflicts. CVS automatically detects conflicts; no worries. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Matthias Kaeppler Sent: Wednesday, June 15, 2005 9:51 AM To: info-cvs@gnu.org Subject: Working on sources in parallel Hello, just recently we had the problem that two people had checked out the same module and were working on it independently. When the second one committed his sources again, CVS reported an error (I can't reproduce it 100% here, sorry) about the sources not being up-to-date. However, I thought that would be exactly what CVS takes care of, in fact making sure that noone has to bother about who else has checked out a version and modifies it, and merges all changes together when committing it back. I haven't seen anything about this issue in the info pages either. Am I missing something? -- Matthias Kaeppler ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cannot checkout new tag
Anyone? -- Neil Watson Network Administrator www.voicegenie.com ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cannot checkout new tag
The silence is telling: not a common problem. As you indicated the problem is intermittent and not easily reproduced: the worst kind! Could it be a buggy release? Maybe: http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00252.html It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with this patch: -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Neil Watson Sent: Wednesday, June 15, 2005 10:35 AM To: info-cvs@gnu.org Subject: Re: cannot checkout new tag Anyone? -- Neil Watson Network Administrator www.voicegenie.com ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: cannot checkout new tag
On Wed, Jun 15, 2005 at 10:59:57AM -0700, Rod Macpherson wrote: Could it be a buggy release? Maybe: http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00252.html It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with this patch: It is vague but, I'm willing to try an upgrade. Are there any tricks to upgrading? Do I ensure that all code is checked in prior to the upgrade? -- Neil Watson Network Administrator www.voicegenie.com ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: cannot checkout new tag
I'd make a copy of your repository directory but my guess is there will be no compatibility issues between your repository and new CVS binaries. Just update the package and any dependencies using RPM. Not to say it isn't the client, but you can upgrade those later. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Neil Watson Sent: Wednesday, June 15, 2005 11:41 AM To: info-cvs@gnu.org Subject: Re: cannot checkout new tag On Wed, Jun 15, 2005 at 10:59:57AM -0700, Rod Macpherson wrote: Could it be a buggy release? Maybe: http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00252.html It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with this patch: It is vague but, I'm willing to try an upgrade. Are there any tricks to upgrading? Do I ensure that all code is checked in prior to the upgrade? -- Neil Watson Network Administrator www.voicegenie.com ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Working on sources in parallel
Alright, thanks a lot! -- Matthias Kaeppler ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Regarding check-in of unicode characters.
Title: Message Maninder, CVS does not support Unicode files, instead they must be committed as binary, in which case you cannot do diff/merge etc. CVSNT on Mac/Linux/Unix/Windows (free, open source, GPL, just like CVS) does support unicode files (-ku). Please supply more information (file type in repository, cvs version etc). To determine the "status" of the file use: cvs status myfile To determine your version of CVS use: cvs version If you are using CVSNT then the CVSNT newsgroup is the place that the developers of CVSNT answer questions: news://news.cvsnt.org/support.cvsnt or http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt Regards, Arthur Barrett -Original Message-From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Maninder Singh(SDG)Sent: Thursday, 16 June 2005 1:51 AMTo: info-cvs@gnu.orgSubject: Regarding check-in of unicode characters. Hi All, We are trying to check-in the following characters into CVS. But while doing so, the highlighted characters get corrupt and upon checking out, these are replaced by some other characters. Sí (means yes in Spanish) Sì (means yes in Italian) Can anybody provide a solution? Thanks and Regards, Maninder Singh ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Repository Access
Hi Class! Currently our CVS repo has 3 main separate projects running under it. By default when I create a new unix user; I give them access to the whole repository, however, some folks have been editing files in projects they were not supposed to. How can I ONLY and specifically create or modify the access rights privileges of only few specific people w/o wreaking havoc on the whole repository? And by default if they're not listed in that file then that means they have access to all projs? Is there a way? Thanks Steven ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
SSH authentication key
Hi, I am using a Linux server to maintian a package with CVS, other ppl can access to the repository by SSH. Now that I can generate SSH-authentication keys by ssh-keygen of Linux, or by some Windows clients, like WinSSHClient(www.ssh.com). My question is if or not I can keep more than one key on my server, i.e., every user has his/her own key, and if so how to configure? Also it seems to me that I can only use root, say su, to run ssh-keygen, otherwise, the keys are something like ?, and ?.pub Is there anything wrong?? I am very new in this field, please advise me, many thanks.. XC ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Working on sources in parallel
I have another question. Let's stick to the scenario Christopher made up. Say person1 thinks it'd be a good idea to remove some helper-function foo(), and replace it with another function bar(). Then he commits the sources. Person2 still works on the outdated source, where foo() exists, and he thinks it'd be a good idea to introduce a new variable or whatever in foo(), so his changes to the file are limited to the function foo. Now he wants to commit his changes, and CVS complains sorry bro, update first. Okay, so he does an update, and... now what? What does CVS do in such a situation? How could it merge the two sources, with changes to a function foo() which was removed by person1? So many questions :) -- Matthias Kaeppler ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
