On Fri, May 15, 2009 at 09:22:11AM -0700, Arvan Pritchard wrote:
> 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.
Can you be more specific? It's hard to understand what you mean.
Can you list the directory tree in some unambiguous and utterly
obvious fashion, like in the example below? Thanks.
documents/
dirA
dirB (External to http://XYZ)
And make really clear how the tree conflict came about?
For a good problem report, it's important to assume that we are
really dense and not able to second-guess anything.
> 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!:
Looks like a bug that is triggered by something in your directory setup.
Are there NTFS junctions involved?
Would it be possible for you to set a break point at the assertion
in a debugger to get the values of dir_path and victim_path at the
time the assertion fails?
> 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'
Have you tried running 'svn cleanup' before reverting?
Stefan
Received on 2009-05-16 14:15:25 CEST