Description

I'm running a 2-URL merge, and svn is aborting when trying to resolve conflicts on a directory that's been added both locally and as part of the other branch being merged in. I cannot reproduce this using simple setups, I have not been able to isolate what exactly triggers this behaviour, but it is reproducable on my repository.

Here's the exact command that I run:

svn merge ^/trunk ^/branches/feature/sempv2_vpn_mon_7 .

It produces many pages of add/modifies/deletes (the merge involve thousands of files), and then it starts interactive resolution of the conflicts.

Summary of conflicts:
Text conflicts: 40
Tree conflicts: 64

I start by choosing "mf" for the first 5 conflicts, and then when it get to the 6th conflict, it prints this: