UFO:Alien Invasion
Development => Coding => Topic started by: Duke on October 03, 2009, 12:34:46 am
-
I used to have a modified version of CL_actor.c.
Then the file was moved to the battlescape subdir (by some other dev).
SVN complained about a merge conflict.
I removed all traces of cl_actor in the old place, but svn continues to complain.
(using svn 1.6.2)
Does anyone know how to clean this up ?
-
complain about what? did you resolv the conflict? (svn resolved <file>)
-
Thx, that did the trick. :)
-
Well, it *almost* did the trick.
On commit, tortoise still offers the the cl_actor.c in the old place with a status of 'missing'.
-
try to revert - any local changes in that file?copy it somewhere else, revert the file, update svn, rescue your changes by replacing your version of the file over the on in the repo.
-
You're the man !
That *really* did the trick :)
btw my local changes had long since been saved of course (to svn) ;)