commit aborted because of conflict, but status doesn't show conflict state

I have the following:

svn: Aborting commit: '/home/timo/Id/DoomSync/main/neo/framework/Heap.cpp' remains in conflict.
timo@sparkle:~/Id/DoomSync/main$ svn status neo/framework/Heap.cpp
A + neo/framework/Heap.cpp

This happens after I merged a branch back into trunk, and the branch had
some files moved around. i.e. trunk had local edits on the file, and
branch had an svn move.

I haven't tried to reproduce this on a test repository. Do you think it's
worth investigating, or is this a known issue? I think I noticed some
mails about edits being lost when svn merge'ing moved files. So I suppose
this would be related.

TTimo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Apr 5 16:30:13 2003