branch vs. trunk delete/re-add trouble

I'm assuming this can be blamed on the "svn doesn't support true
renames" issue but I am less interested in the why than I am in
finding my out of this hole.

Short version:

-- create destination for upcoming branch
svn mkdir URL/sandbox/stephen

-- create branch
svn copy URL/trunk URL/sandbox/stephen/PlayerBranch

-- on a trunk wc, somebody deleted a file and then added it back
after reconsidering:
svn delete fileA.cpp
...
svn add fileA.cpp

-- on my branch, do merge from TOT with svnmerge.py
svnmerge.py merge
... files updated/merged ...

-- try to commit
svn ci -m 'merge from TOT'
svn: Commit failed (details follow):
svn: Item '/sandbox/stephen/PlayerBranch/fileA.cpp' is out of date

No amount of cleanup, update, resolved, etc. seems to make any
difference. Does anyone have any suggestions for getting back on track.

There's also another file which gives me the following error but I'm
sure they're related and can hopefully be solved together:

svn: REPORT request failed on '/svn/!svn/vcc/default'
svn: Working copy path 'fileB.h' does not exist in repository

Both of these files were deleted and then re-added but they are
behaving differently now. I got desperate and "svn rm'ed" fileA
directly from my branch and that took but decided I should probably
stop blasting away wildly until I had asked for some help.

thanks,
stephen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 1 18:26:01 2006