project-navigation
News
Download
Forum
Contribute
Media
FAQ
About
Contact
Personal tools
Login
Register
Welcome,
Guest
. Please
login
or
register
.
1 Hour
1 Day
1 Week
1 Month
Forever
Login with username, password and session length
News:
New board
Home
Help
Search
Login
Register
UFO:Alien Invasion
»
Development
»
Coding
»
A little svn prob
« previous
next »
Print
Pages: [
1
]
Go Down
Author
Topic: A little svn prob (Read 3747 times)
Duke
Administrator
PHALANX veteran
Posts: 1037
A little svn prob
«
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 ?
Logged
Mattn
Administrator
PHALANX Commander
Posts: 4831
https://github.com/mgerhardy/vengi
Re: A little svn prob
«
Reply #1 on:
October 03, 2009, 11:05:59 am »
complain about what? did you resolv the conflict? (svn resolved <file>)
Logged
Duke
Administrator
PHALANX veteran
Posts: 1037
Re: A little svn prob
«
Reply #2 on:
October 03, 2009, 09:46:42 pm »
Thx, that did the trick.
Logged
Duke
Administrator
PHALANX veteran
Posts: 1037
Re: A little svn prob
«
Reply #3 on:
October 06, 2009, 11:32:16 pm »
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'.
Logged
Mattn
Administrator
PHALANX Commander
Posts: 4831
https://github.com/mgerhardy/vengi
Re: A little svn prob
«
Reply #4 on:
October 06, 2009, 11:34:58 pm »
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.
Logged
Duke
Administrator
PHALANX veteran
Posts: 1037
Re: A little svn prob
«
Reply #5 on:
October 07, 2009, 12:21:30 am »
You're the man !
That *really* did the trick
btw my local changes had long since been saved of course (to svn)
Logged
Print
Pages: [
1
]
Go Up
« previous
next »
UFO:Alien Invasion
»
Development
»
Coding
»
A little svn prob