Comment 11 for bug 375898

I'm able to reproduce the bug in a smaller test case:
- merge a branch with no common ancestry (with -r0..)
- renamed all the merged files,
- delete a file present in the imported root directory
- merge subsequent changes from the branch (the deleted file doesn't need to be modified)

Possible workarounds:
- use merge-into (better in principle but as mentioned above some blocking bugs
  should be fixed there too :-/)
- *before* the initial merge, move all content of the branch to be merged into a single directory,
   the initial and subsequents merges will now avoid the problem.

I'm still investigating a fix for bzr but using the above workaround should unblock the situation.