[SVN-3469] tree conflict at directory external causes assertion to fail

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.12
• Component/s: libsvn_wc
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 25/Aug/09 13:45
• Updated: 27/Oct/18 16:29
• Resolved: 08/Jul/11 14:36

Description

Reported in
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2387071

In file 
'D:\Development\SVN\Releases\TortoiseSVN-1.6.3\ext\subversion\subversion
\libsvn_wc\tree_conflicts.c' 
line 568: assertion failed (strcmp(dir_path,
                            svn_path_dirname(victim_path, pool)) == 0)
 
Encountered this error while reverting in a folder which had a tree
conflict. I right clicked in the folder and chose SVN Revert and clicked
OK, which immediately caused this error. I had to remove the conflicted
folder to solve the problem. The folder which caused the tree conflict
was included by the svn:externals property. The tree conflict was caused
by a merge above this folder.


1. So my structure was: svn://repo/branch/X, with svn:externals Y
   from svn://repo/trunk/X/Y;

2. I merged a revision from trunk (containing modifications of
   svn://repo/trunk/X/Y) to branch;

3. A tree conflict occurred for svn://repo/branch/X/Y (which is an
   external included folder);

4. I could not revert svn://repo/branch/X.

http://svn.haxx.se/dev/archive-2011-03/0682.shtml#[e-mail]

Issue Links

• depends upon: SVN-3818 fix handling of externals in wc-ng
• is blocked by: SVN-3818 fix handling of externals in wc-ng