--- /usr/lib/python2.6/dist-packages/bzrlib/transform.py.org	2010-10-14 11:42:07.000000000 +0200
+++ /usr/lib/python2.6/dist-packages/bzrlib/transform.py	2010-10-14 11:42:34.000000000 +0200
@@ -2841,7 +2841,7 @@
             file_id = tt.inactive_file_id(conflict[1])
             # special-case the other tree root (move its children instead)
             if path_tree and file_id in path_tree:
-                if path_tree.inventory[file_id].parent_id is None:
+                if file_id == path_tree.path2id(''):
                     continue
             tt.version_file(file_id, conflict[1])
             new_conflicts.add((c_type, 'Versioned directory', conflict[1]))