svn cannot commit deleted file - it is out of date and path is not found -


first of all, have tried suggestions found in other questions related this.

i moved folder , contents:

svn mv heuristics/edgeprobselector selectors/. 

then renamed folder:

svn rename selectors/edgeprobselector selectors/probabilityedge 

then renamed files inside:

svn rename selectors/probabilityedge/edgeprobselector.hpp selectors/probabilityedge/probability.cpp 

this things broke. got conflicts when tried commit. had resolve tree conflicts, using (for many directories)

svn resolve --accept working /blah/blah 

now, when try commit, get:

svn commit -m "blah"  svn: commit failed (details follow): svn: file 'selectors/probabilityedge/edgeprobselector.cpp' out of date svn: selectors/probabilityedge/edgeprobselector.cpp' path not found 

i have tried updating, resolving, touching , updating deleting. recommendations other posts, , nothing has worked, still error.

i tried touch missing file, , run update , delete, problem still persists, error being:

svn: 2 top-level reports no target 

before try very drastic actions can help?


Comments

Popular posts from this blog

c++ - Difference between pre and post decrement in recursive function argument -

php - Nothing but 'run(); ' when browsing to my local project, how do I fix this? -

php - How can I echo out this array? -