> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Saturday, May 16, 2009 1:15 PM
> To: Arvan Pritchard
> Cc: dev_at_subversion.tigris.org
> Subject: Re: Subversion assertion failure
>
> 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)
trunk/Documents/Project folder with svn:externals set to
^/branches/P50X/documents Piranesi51 at rev 47743
subfolders 22 normal folders in the repository, including
Piranesi5
Piranesi6
plus Piranesi51 (external to branches/P50X/documents)
branches/P50X/documents created at rev 47742
contains a single file pir-uservis51-ov.htm created at rev 47742 and modified several times.
>
> And make really clear how the tree conflict came about?
>
Problem started when merging branches/P50X into trunk and including revisions
after 47743, possibly the problem revision was 47750 which modified:
branches/P50X/documents/pir-uservis51-ov.htm
trunk/Documents/Project/Piranesi5/pir-uservis50-ov.htm
trunk/Documents/Project/Piranesi6/pir-uservis60-ov.htm
> For a good problem report, it's important to assume that we are
> really dense and not able to second-guess anything.
>
Sorry, I didn't know what information would be useful.
> > 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?
No NTFS junctions, using the directory structure described above.
I'm no longer getting the assert, just "Unable to lock" like the command line.
If it happens again I'll try to attach a debugger.
>
> > 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?
Yes, it says:
D:\svn\trunk>svn cleanup .
D:\svn\trunk>svn -R revert .
svn: Unable to lock 'documents'
Thanks for looking at this.
Arvan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2298041
Received on 2009-05-18 11:23:50 CEST