Game Development Community

Update Problem

by Ian Roach · in Torque Game Engine · 03/06/2002 (2:07 am) · 2 replies

im having a problem with the update and merge of code.

I recently made some changes to my .dsp project file (adding gui objects e.t.c)

i then did a update using wincvs to see if there was any new code.

When updating the dsp file it screwed up

-f server: Updating vc6
C vc6/Torque Demo.dsp
M vc6/Torque SDK.opt

*****CVS exited normally with code 1*****

And now i cant open the project file at all.

Visual C++ just says it cannot open the dsp file due to some error.

How can i fix this ?
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Associate Stefan Beffy Moises
#1
03/06/2002 (2:30 am)
Dunno how to fix it, but to prevent it the next time you should probably make a "Clean" in VC++ before updating, because WinCVS seems to have a tough time dealing with those temporary files VC++ creates while compiling (like opt, ...).

Torque 3D Owner Alexander Gugau
#2
03/06/2002 (7:19 am)
Hi,

the C before Demo.dsp means there was a merging conflict by CVS.
First possibility: delete the dsp-file, update it from CVS and then add your files again.
Second possibility: open the dsp-file with a text editor and look for lines begining with ### (some version number). Remove those lines and check the lines between these marks (probably there a two lines with only slight differences). You can use the old dsp-file as a reference. It is renamed to something like .#Demo.dsp.1.2 by CVS

Hope this helps
Alex