Subversion assertion failure

I triggered this assertion on Windows XP using Tortoise SVN 1.6.2 and an SVN 1.6.2 server:

In file D:\Development\SVN\Releases\TortoiseSVN-1.6.2\ext\subversion\subversion\libsvn_wc\tree_conflicts.c
line 568:

assertion failed (strcmp(dir_path, svn_path_dirname(victim_path, pool)) == 0)

several times trying to mark a tree conflict resolved from tortoisesvn, and again trying to revert the whole working copy from tortoisesvn.

The original conflict was generated in a merge back to the trunk, driven by tortoise svn, and involved a folder "documents" that contains a subfolder on the branch, and an external reference to that subfolder on the trunk.

Revert window for tortoisesvn said:

Command: Revert
Reverted: D:\svn\trunk
Error: In file
Error: 'D:\Development\SVN\Releases\TortoiseSVN-1.6.2\ext\subversion\subversion\libsvn_wc\tree_conflicts.c'
Error: line 568: assertion failed (strcmp(dir_path, svn_path_dirname(victim_path,
Error: pool)) == 0)
Finished!:

after some work with svn from the command line, I have managed to revert everything except that folder and I've now got a working copy where that folder cannot be locked.

D:\svn\trunk>svn status
! C documents
> local delete, incoming edit upon merge

D:\svn\trunk>svn -R revert .
svn: Unable to lock 'documents'

D:\svn\trunk>svn cleanup .

D:\svn\trunk>svn -R revert .
svn: Unable to lock 'documents'

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2272501
Received on 2009-05-16 02:13:39 CEST