Subversion Exception

[Abby Kehat]

These were the steps I took before I got this error:


1.   I branched a project and committed my changes to the branch.

2.   I checked out a fresh working copy of the trunk.

3.   I merged the changes from the branch into the fresh working copy of 
the trunk.

4.   I committed the merged changes to the trunk.

5.   I then tried to update my original, older working copy of the same 
project and got a Subversion Exception, with the following message (I tried 
attaching a capture of the message, but your mail server rejected it as spam).

Subversion reported the following:

In file 
'D:\Development\SVN\Releases\TortoiseSVN-1.6.2\ext\subversion\libsvn_ra_svn\marshal.c'
line 486: assertion failed (opt || cstr)

Subversion Exception

[Abby Kehat]

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)

Thanks,
Abby.