[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subversion Exception

From: Stefan Sperling <stsp_at_elego.de>
Date: Sun, 20 Jun 2010 16:34:58 +0200

On Sun, Jun 20, 2010 at 12:06:44PM +0300, Abby Kehat wrote:
> Hi -
> I was trying to merge modifications from a branch into a working copy. I had a few tree conflicts, and when I tried to resolve them, whether requesting to keep the directory from the repository or marking the conflict as resolved, I got the following exception:
> Subversion encountered a serious problem...
> Subversion reported the following:
> In file
> 'D:\Development\SVN\Releases\TortoiseSVN-1.6.8\ext\subversion\libsvn_wc\tree_conflicts.c'
> line 550: assertion failed (strcmp(dir_path, svn_path_dirname(victim_path, pool)) == 0)

The fix this will be in the 1.6.12 release which is due to
be released tomorrow.

The problem only happens on tree-conflicted directories which are
the root of an external.

Received on 2010-06-20 16:35:43 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.