View topic - unable to commit to SVN - and other SVN troubles.



All times are UTC + 1 hour


Post new topic Reply to topic  [ 3 posts ] 
Author Message
PostPosted: 01 Aug 2011, 22:17 

Joined: 10 Jul 2009, 22:34
So I noticed that I'm unable to commit my changes to SVN. Also, when I go to the googlecode web interface to the SVN, and it go into the CT game, and I go into LuaRules/Gadgets, the list there is several revisions old. It still shows YMSAI as one file (tp_YMSAI.lua) and not as the two files it was split into several revisions ago. When I ran svn update to see if my local copy was somehow out of sync (maybe someone else had made a commit*) all it did was plop down tp_YMSAI.lua alongside the two "real" YMSAI files. So maybe SVN rejected my splitting YMSAI into two files?

Anyway, theres an SVN problem.


*does this ever happen?


Top
 Offline Profile  
 
PostPosted: 01 Aug 2011, 23:54 
Conflict Terra Developer
User avatar

Joined: 21 Jan 2010, 06:21
Location: Tucson
I've noticed some of your commit notes have alluded to more being done than your actual commits. Sounds like classic out-of-sync copies. My advice: stash the files you want to keep in a different folder, namely your AI files and anything associated with them, then delete your copy of CT, and then re-Checkout a new copy. Start fresh.

Then of course place your AI files in and make sure everything looks good. You have to make sure all of the files you want to commit are check-boxed when you make the commit.


Top
 Offline Profile  
 
PostPosted: 02 Aug 2011, 08:57 
Moderator
User avatar

Joined: 22 Feb 2006, 01:02
Location: cheap kitchen
Quote:
When I ran svn update to see if my local copy was somehow out of sync (maybe someone else had made a commit*)
That can happen, its called a "svn conflict", svn software has some function called "resolve conflicts" or similiar, it allows to pick which version of a file you want to keep. Dont think that happend here though.

How did you split the files?
I find best way to add a new file is actually create an empty file, c&p in the stuff you want and then add that new file to the svn. I think there are "easier" svn functions for that but I dont "trust" them/dont know how to use.


Top
 Offline Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 3 posts ] 

All times are UTC + 1 hour


Who is online

Users browsing this forum: No registered users and 2 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
Powered by phpBB® Forum Software © phpBB Group

Site layout created by Roflcopter et al.