|
From: kristi t. <kri...@gm...> - 2006-05-13 20:03:33
|
Rob & Zach: DO NOT UPDATE YOUR PROJECT. Make a zip backup of your current project files first. I tagged what was in the project before as Post_CVS_Crash_2006_05_13. I committed the changes from my files and tagged that as CVS_Fix_Kristi_2006_05_13 Also, using evolveproject.cvs.sf.net doesn't seem to work. (At least not right now). I had to use evolveproject.cvs.sourceforge.net (with sf expanded to sourceforge). So I attempted to re-commit everything with the files on my hard drive. I think it was the project state ~May 7th, guessing by looking at the file timestamps. The re-commit process is kinda weird because Eclipse won't automatically detect a difference even when the version number on your harddrive is newer than the version in CVS. Here's what I had to do: 1) I had to go to Team =3D> Disconnect, and choose "Also delete CVS meta data" to remove the CVS directories. 2) Then go to Team =3D> Share Project, and choose the evolveproject.cvs.sourceforge.net repository location that you should already have. 3) Select "Use project name as module name" (assuming the project name is EvolveNet) 4) Select the HEAD tag 5) Wait while the project files are downloaded and compared with the files on your hard drive 6) UNCHECK the launch commit wizard option. (This option will attempt to commit all your changes, which isn't good. You should synchronize first, see next step) Press OK. 7) Go to the Team Synchronization perspective and synchronize the project. Review/merge your changes then commit as usual. (To commit a file with a conflict, first go through and copy the changes into your file. There's a button "Copy all non-conflicting changes from left to right" which is pretty useful, though you have to manually look at any conflicting changes. Then right click on the file and choose "Mark as Merged". Then you can commit the file.) Another note, I'm going to delete the EvolveNet jars from CVS cuz i'm tired of having to download them. =3DP (Don't worry, I'm not talking about the jogl and jfreechart jars, just the EvolveServer.jar and whatnot.) |
