Comment 2 for bug 715058

Not introduced but probably uncovered by the fix for bug #638451.
Anyway, the fix is the same (below if you're blocked), I'll target 2.3 with tests.

=== modified file 'bzrlib/conflicts.py'
--- bzrlib/conflicts.py 2011-01-16 01:12:01 +0000
+++ bzrlib/conflicts.py 2011-02-08 09:45:35 +0000
@@ -644,8 +644,9 @@
         winner_tid = tt.trans_id_tree_path(winner_path)
         winner_parent_tid = tt.get_tree_parent(winner_tid)
         # Switch the paths to preserve the content
- tt.adjust_path(self.path, winner_parent_tid, winner_tid)
- tt.adjust_path(winner_path, item_parent_tid, item_tid)
+ tt.adjust_path(osutils.basename(self.path),
+ winner_parent_tid, winner_tid)
+ tt.adjust_path(osutils.basename(winner_path), item_parent_tid, item_tid)

There is another similar latent bug with ParentLoop, I'll fix it as well.

Thanks to your test this was a breathe to debug and fix... invaluable...