Re: strange cvs diff problem with pcl-cvs and viewcvs
Hello, it is me again. Is this question to stupid or does nobody have an idea? Fabian Braennstroem [EMAIL PROTECTED] writes: Hello, This is probably my last chance to get an answer; I already wrote my problem in the Emacs, ViewCVS and German Debian-Group, with no solution :-( I have a strange problem to show the diffs from my cvs repository. Actually the problem occurs with ViewCVS and PCL-cvs when I want to show the differences between revisions. e.g. showing the diffs on the console with 'cvs diff -r 1.9 -r 1.10 main.f' everything is correct: Index: main.f === RCS file: /home/fab/cvsroot/Simulation/16/ code/main.f,v retrieving revision 1.9 retrieving revision 1.10 diff -r1.9 -r1.10 299d298 300a300 305,335c305,335 c print x y ni=82 if (nvisit.eq.0) then ... ... --- c$$$c print x y c$$$ ni=82 c$$$ if (nvisit.eq.0) then ... ... The revision 1.10 is currently the last revision for 'main.f'. My problem is, that ViewCVS and PCL-cvs don't show any differences between revision 1.10 and 1.9; they say that there are no differences!? This problem does not occur just for 1.9 and 1.10, it occurs for every file and every revision!? Everything else like showing the logs, checkout, checkin,... works fine. Could it be that there is any basic setup wrong? In the beginning I just had cvs installed (right now version 1.11.15), now I added rcs to see the files in viewcvs. Best Greetings! -- Fabian Braennstroem Duesseldorf/Berlin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Release command doesn't delete my working copy
Hello Anand, * On Tue, Jun 15, 2004 at 12:35:52AM +0200 Anand Graves wrote: Then I ran the command: cvs release -d I have never used release this way as you, but I always go to the directory above and release with cvs release -d directoryname and it works quite well. I assume you could even run cvs release -d * to release anything (but the top level directory). Regards, Spiro. -- Spiro R. Trikaliotis http://www.trikaliotis.net/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: strange cvs diff problem with pcl-cvs and viewcvs
Hello Fabian, * On Tue, Jun 15, 2004 at 08:40:32AM +0200 Fabian Braennstroem wrote: it is me again. Is this question to stupid or does nobody have an idea? I believe nobody would have an idea. For the rest: Fabian already asked on other mailing lists, without success. So, if anyone has an idea, don't think he'll ask on another list where it is more appropriate if I don't answer, but answer to help him. ;-) Regards, Spiro. -- Spiro R. Trikaliotis http://www.trikaliotis.net/ http://www.viceteam.org/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: strange cvs diff problem with pcl-cvs and viewcvs
At 02:40 AM 6/15/2004, Fabian Braennstroem wrote: The revision 1.10 is currently the last revision for 'main.f'. My problem is, that ViewCVS and PCL-cvs don't show any differences between revision 1.10 and 1.9; they say that there are no differences!? I'm not sure how ViewCVS and PCL-cvs run the diff command, but here's a clue. Suppose you update your sandbox and main.f 1.9 is the version you get. If you run cvs diff main.f you will see that there are no differences. That's to be expected. Someone checks in a revision to main.f, producing version 1.10. Now, if you run that same cvs diff command again, you will still get no differences! That's surprising until you remember that the diff command compares the local file with the version in the repository (1.9) that it's based on. To see the differences between the local file and the head version you need to use the command cvs diff -r HEAD main.f. So, if your tools are using the cvs diff main.f command, then the output you see is correct. Fred ___ Frederic W. Brehm, Sarnoff Corporation, http://www.sarnoff.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: strange cvs diff problem with pcl-cvs and viewcvs
Fabian Braennstroem wrote: it is me again. Is this question to stupid or does nobody have an idea? Probably the latter. It *sounds* like a ViewCVS problem, but I'm guessing and I could easily be wrong. If ViewCVS is open source, you might try debugging it yourself to try to track down the problem. -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. (http://www.leitch.com) Columnist, C/C++ Users Journal (http://www.cuj.com/experts) ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Best way to forward-diff from working copy to HEAD (was Re: strange cvs diff problem with pcl-cvs and viewcvs)
Quick add-on question: On Tue, Jun 15, 2004 at 08:25:14AM -0400, Frederic Brehm wrote: To see the differences between the local file and the head version you need to use the command cvs diff -r HEAD main.f. Any way to reverse that so it's a forward diff, particularly on a whole file set at once? I've been using cvs diff -r BASE -r HEAD [file] but that generates error messages when files have been removed etc., and I wonder if there's a better way. This tactic also seems to fail on branches, though I find HEAD seems to have a different meaning sometimes on a branch anyway. -- Doug Lee [EMAIL PROTECTED]http://www.dlee.org Bartimaeus Group [EMAIL PROTECTED] http://www.bartsite.com Is your cucumber bitter? Throw it away. Are there briars in your path? Turn aside. That is enough. Do not go on to say, `Why were things of this sort ever brought into the world?' --Marcus Aurelius ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? -chris -Original Message- From: MKlinke [mailto:[EMAIL PROTECTED] Sent: Monday, June 14, 2004 5:06 PM To: Fouts Christopher (IFNA RTP) Subject: Re: Remote CVS access via SSH On Monday 14 June 2004 15:47, [EMAIL PROTECTED] wrote: Sorry if this does NOT belong to this group. I'm only hoping someone has done this before... Ok, I finally got this working. Understandly so, whenever I enter a CVS command, I'm prompted for a password so I can tunnel through. As you folks know, this is a LOT of passwords to enter per session. My Essential CVS book says, ...generate an SSH key for the client, using the key- generation program. You may want to add the key to the user's home directory on the server, as explained in the documentation for your SSH program. If you do so, the user won't need to provide a password when connecting with SSH. We use RH Fedora, which has OpenSSH. Where is this key-generation prgram? See the explanation in man ssh and search for keygen. The binary is at: /usr/bin/ssh-keygen Regards, Mike Klinke ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Backing up a Repository on MacOSX
I backup my CVS repository on OS X by using the hdiutil (or you could use Disk Utility for a nice GUI interface to this tool) to create a disk image. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Eric Gorr Sent: Monday, June 14, 2004 5:48 PM To: [EMAIL PROTECTED] Subject: Backing up a Repository on MacOSX I know that under normal circumstances, one should avoid using the unix 'dump' command to perform a backup on a MacOSX system. I was wondering if this would apply to a CVS repository? Anyone try it? ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
On Tue, 2004-06-15 at 10:39, [EMAIL PROTECTED] wrote: Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? Use a blank passphrase. Tom ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
Du, why didn't I think of that. It worked! Thanks. -chris -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Tom Copeland Sent: Tuesday, June 15, 2004 10:49 AM To: [EMAIL PROTECTED] Subject: RE: Remote CVS access via SSH On Tue, 2004-06-15 at 10:39, [EMAIL PROTECTED] wrote: Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? Use a blank passphrase. Tom ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Remote CVS access via SSH
On Jun 15, 2004, at 10:49 AM, Tom Copeland wrote: On Tue, 2004-06-15 at 10:39, [EMAIL PROTECTED] wrote: Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? Use a blank passphrase. Or better yet, man ssh-agent That lets you enter your passphrase once and caches the key for subsequent uses. That makes *me* much less nervous than blank passphrases, especially if I'm using a laptop! HTH, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
On Tue, 2004-06-15 at 10:58, [EMAIL PROTECTED] wrote: Du, why didn't I think of that. It worked! Thanks. Cool, no problemo... Tom ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
Ok, I'll look into this too. Thanks... -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Geoff Beier Sent: Tuesday, June 15, 2004 10:53 AM To: Tom Copeland Cc: [EMAIL PROTECTED] Subject: Re: Remote CVS access via SSH On Jun 15, 2004, at 10:49 AM, Tom Copeland wrote: On Tue, 2004-06-15 at 10:39, [EMAIL PROTECTED] wrote: Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? Use a blank passphrase. Or better yet, man ssh-agent That lets you enter your passphrase once and caches the key for subsequent uses. That makes *me* much less nervous than blank passphrases, especially if I'm using a laptop! HTH, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Remote CVS access via SSH
This worked too. You folks are cool! Thanks... -chris -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Geoff Beier Sent: Tuesday, June 15, 2004 10:53 AM To: Tom Copeland Cc: [EMAIL PROTECTED] Subject: Re: Remote CVS access via SSH On Jun 15, 2004, at 10:49 AM, Tom Copeland wrote: On Tue, 2004-06-15 at 10:39, [EMAIL PROTECTED] wrote: Thanks. This worked. However, instead of entering the password 100,000 times (every CVS command), I now have to enter the paraphrase 100,000 times (every CVS command.) Again as you know this is combersome. How can I manage this so I don't have to enter anything? Use a blank passphrase. Or better yet, man ssh-agent That lets you enter your passphrase once and caches the key for subsequent uses. That makes *me* much less nervous than blank passphrases, especially if I'm using a laptop! HTH, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Preserve empty directories when checking out a tagged version
Hi all, I have seen that when a module in CVS contains empty folders and it is tagged, if I do a checkout of the module the empty folders are retrieved too but if I do a checkout of a tagged version of the module then those empty folders are not retrieved. I have read about the '-r' option and says the following: `-r TAG' Use revision TAG. This option is sticky, and implies `-P' Is there a way to execute a checkout of a tagged version and retrieve the empty folders too? Thanks in advance, esther -- ~ Code matters more than comercials ~ -- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
How to undo a change to a branch
I just mistakenly committed a change to a (non-trunk) branch. What's the best way to undo this change? (I'm tempted to just delete the change in the RCS file, but I figure I'd better learn the right way to do this.) Thanks! kj ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: How to undo a change to a branch
On Tue, Jun 15, 2004 at 02:12:42PM -0400, Kynn Jones wrote: I just mistakenly committed a change to a (non-trunk) branch. What's the best way to undo this change? (I'm tempted to just delete the change in the RCS file, but I figure I'd better learn the right way to do this.) cvs up -j[revision including change you didn't mean to commit] -j[revision before change you didn't mean to commit] filename will merge out the change you meant to get rid of. Sanity check the file, then commit it. Easy as pie. tyler ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Branch revision numbers -- help
Hi I created a repository. First I imported sources from a release, say rel 1. Then I made a tag. Then I updated this with files from rel 2 by adding/committing. Made a tag again. Then I put another release on top of this and tagged. From this 3rd tag, I made a branch. I see the following when I check out from this branch now. For one file that was added (not imported), the status command shows Sticky Tag: Br_CRMR1_Dev (branch: 1.1.2) and log shows Br_CRMR1_Dev: 1.1.0.2 For a file that has been imported, initially, the status shows Sticky Tag: Br_CRMR1_Dev (branch: 1.1.1.1.2) and log shows Br_CRMR1_Dev: 1.1.1.1.0.2 Is this consistent or have I done something wrong? Thanks a lot for any insights. --Jeeva __ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Branch revision numbers -- help
Jeeva Sarma writes: [stuff about import, branches, and revision numbers] Is this consistent or have I done something wrong? It looks fine to me. -Larry Jones There's never enough time to do all the nothing you want. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Preserve empty directories when checking out a tagged version
Esther Parrilla Endrino writes: Is there a way to execute a checkout of a tagged version and retrieve the empty folders too? No. Getting empty directories when you don't specify a revision or -P is just an accident of history -- we generally suggest adding -P to your .cvsrc file so that it behaves consistently. Either add a file to the directory so it's not empty anymore or create it another way (e.g., as part of your build process) rather than expecting CVS to create it. -Larry Jones I'm so disappointed. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
