CVS is causing me grief!
by Demolishun · in Torque Game Engine · 10/15/2004 (9:08 pm) · 4 replies
Okay, I am absolutely pulling my hair out. I am trying to update my copy of the head from way back and the thing keeps on giving me messages like this:
This is the command I am trying to use:
So can anyone tell me what the deal is? I want to save bandwidth, but I have spent a day trying to figure this one out. Why the heck is this so hard? Also I did a 'diff' between this file (torque_cw6.mcp) and another file in a directory containing an identical copy of the head I am trying to update and they were identical after the update.
BTW This is under Linux using the command line version of CVS. I am trying to update my copy of the head from way back to the current tagged version of 1.3.
Thanks,
Frank
cvs update: move away torque/cw/torque_cw6.mcp; it is in the way
C torque/cw/torque_cw6.mcp
This is the command I am trying to use:
cvs -z3 update -A -P -d -r Release_1_3_0 torque
So can anyone tell me what the deal is? I want to save bandwidth, but I have spent a day trying to figure this one out. Why the heck is this so hard? Also I did a 'diff' between this file (torque_cw6.mcp) and another file in a directory containing an identical copy of the head I am trying to update and they were identical after the update.
BTW This is under Linux using the command line version of CVS. I am trying to update my copy of the head from way back to the current tagged version of 1.3.
Thanks,
Frank
About the author
I love programming, I love programming things that go click, whirr, boom. For organized T3D Links visit: http://demolishun.com/?page_id=67
#2
Your problem is you have a checkout going into the wrong directory and it's causing a conflict. Just drop the new HEAD into a new directory and you should be fine. If you are trying to merge or diff a really old version by some chance, I think you are SOL on that.
10/15/2004 (9:32 pm)
And I quote from GG's own documentation....Quote:Check the Use TCP/IP compression check box and set the compression number to 3.
Your problem is you have a checkout going into the wrong directory and it's causing a conflict. Just drop the new HEAD into a new directory and you should be fine. If you are trying to merge or diff a really old version by some chance, I think you are SOL on that.
#3
Thanks Nathan and Gonzo. I will get back to you on what I find.
Frank
10/16/2004 (8:00 am)
Let me explain. I have a version of the head from 04-24-2004 that I am trying to update to the 1.3 release. Now I am wondering how CVS identifies files. If it is by date and I copy a directory without maintaining date information then that could be why it messed up. I will try that next.Thanks Nathan and Gonzo. I will get back to you on what I find.
Frank
#4
10/16/2004 (7:23 pm)
When CVS says something is in the way, it literally means the file is in the way. It wants you to delete it (I would rename it instead).
Torque Owner Nathan Martin
TRON 2001 Network