With this revision:
% bzr log --show-ids -l1
------------------------------------------------------------
revno: 183 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Ian Clatworthy <email address hidden>
branch nick: trunk
timestamp: Mon 2009-07-20 14:53:33 +1000
message:
Here-document style commit messages (Samuel Bronson)
------------------------------------------------------------
I ran
% bzr selftest -s bp.fastimport > 20090721-failures.log
and it gave me 15 errrors. Read on:
testing: /usr/bin/bzr
/usr/lib/python2.5/site-packages/bzrlib (1.18dev python2.5.4)
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory.test_delete_dir
An inconsistent delta was supplied involving u'e', 'abe-20090721040758-h1b2s4qbde1rphbf-29'
reason: Entry was at wrong other path u'a/b/e'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-50'
reason: Entry was at wrong other path u'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-53'
reason: Entry was at wrong other path u'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-68'
reason: Entry was at wrong other path u'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-72'
reason: Entry was at wrong other path u'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory.test_delete_dir
An inconsistent delta was supplied involving u'e/f', 'abef-20090721040758-h1b2s4qbde1rphbf-109'
reason: Entry was at wrong other path 'a/b/e/f'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-129'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-132'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-147'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-151'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory.test_delete_dir
An inconsistent delta was supplied involving u'e/f', 'abef-20090721040758-h1b2s4qbde1rphbf-188'
reason: Entry was at wrong other path 'a/b/e/f'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-208'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-211'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_file
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-226'
reason: Entry was at wrong other path 'a/b/c'.
ABORT: exception occurred processing commit :2
ERROR: bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_symlink
An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-230'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_delete_dir (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory.test_delete_dir]
7.127 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory.test_delete_dir/work/.bzr/.
7.156 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9cc794c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory.test_delete_dir/work/.bzr/
7.265 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkDeleteDirectory.test_delete_dir]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 456, in test_delete_dir
handler.process(self.file_command_iter(paths, dir))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 310, in _add_inventory_by_delta
propagate_caches=False)
File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 761, in add_inventory_by_delta
propagate_caches=propagate_caches)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1693, in create_by_apply_delta
self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'e', 'abe-20090721040758-h1b2s4qbde1rphbf-29'
reason: Entry was at wrong other path u'a/b/e'.
======================================================================
ERROR: test_modify_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_file]
10.780 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_file/work/.bzr/.
10.795 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9e9de0c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_file/work/.bzr/
10.878 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 336, in test_modify_directory_becomes_file
handler.process(self.file_command_iter(path1, path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 310, in _add_inventory_by_delta
propagate_caches=False)
File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 761, in add_inventory_by_delta
propagate_caches=propagate_caches)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1693, in create_by_apply_delta
self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-50'
reason: Entry was at wrong other path u'a/b/c'.
======================================================================
ERROR: test_modify_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_symlink]
10.899 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/.
10.916 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0xb77c406c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/
11.000 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkModifyTricky.test_modify_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 362, in test_modify_directory_becomes_symlink
handler.process(self.file_command_iter(path1, path2, 'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 310, in _add_inventory_by_delta
propagate_caches=False)
File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 761, in add_inventory_by_delta
propagate_caches=propagate_caches)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1693, in create_by_apply_delta
self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-53'
reason: Entry was at wrong other path u'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_file]
12.897 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_file/work/.bzr/.
12.913 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9ad894c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_file/work/.bzr/
13.001 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 561, in test_rename_directory_becomes_file
handler.process(self.file_command_iter(path1, old_path2, new_path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 310, in _add_inventory_by_delta
propagate_caches=False)
File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 761, in add_inventory_by_delta
propagate_caches=propagate_caches)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1693, in create_by_apply_delta
self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-68'
reason: Entry was at wrong other path u'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_symlink]
13.023 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/.
13.039 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9cf052c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/
13.160 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToChkRenameTricky.test_rename_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 591, in test_rename_directory_becomes_symlink
'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 310, in _add_inventory_by_delta
propagate_caches=False)
File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 761, in add_inventory_by_delta
propagate_caches=propagate_caches)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1693, in create_by_apply_delta
self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-72'
reason: Entry was at wrong other path u'a/b/c'.
======================================================================
ERROR: test_delete_dir (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory.test_delete_dir]
16.327 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory.test_delete_dir/work/.bzr/.
16.339 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x9c58bcc> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory.test_delete_dir/work/.bzr/
16.408 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteDirectory.test_delete_dir]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 456, in test_delete_dir
handler.process(self.file_command_iter(paths, dir))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'e/f', 'abef-20090721040758-h1b2s4qbde1rphbf-109'
reason: Entry was at wrong other path 'a/b/e/f'.
======================================================================
ERROR: test_modify_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_file]
18.940 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_file/work/.bzr/.
18.952 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0xb76bc8ec> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_file/work/.bzr/
19.025 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 336, in test_modify_directory_becomes_file
handler.process(self.file_command_iter(path1, path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-129'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_modify_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_symlink]
19.047 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/.
19.060 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x9af406c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/
19.124 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackModifyTricky.test_modify_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 362, in test_modify_directory_becomes_symlink
handler.process(self.file_command_iter(path1, path2, 'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-132'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_file]
20.324 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_file/work/.bzr/.
20.341 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x9cccfec> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_file/work/.bzr/
20.408 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 561, in test_rename_directory_becomes_file
handler.process(self.file_command_iter(path1, old_path2, new_path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-147'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_symlink]
20.430 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/.
20.441 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x9cf6a4c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/
20.510 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToPackRenameTricky.test_rename_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 591, in test_rename_directory_becomes_symlink
'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-151'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_delete_dir (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory.test_delete_dir]
24.861 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory.test_delete_dir/work/.bzr/.
24.874 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9e9d86c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory.test_delete_dir/work/.bzr/
24.948 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootDeleteDirectory.test_delete_dir]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 456, in test_delete_dir
handler.process(self.file_command_iter(paths, dir))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'e/f', 'abef-20090721040758-h1b2s4qbde1rphbf-188'
reason: Entry was at wrong other path 'a/b/e/f'.
======================================================================
ERROR: test_modify_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_file]
27.521 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_file/work/.bzr/.
27.535 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9ce27cc> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_file/work/.bzr/
27.605 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 336, in test_modify_directory_becomes_file
handler.process(self.file_command_iter(path1, path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-208'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_modify_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_symlink]
27.648 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/.
27.674 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9cfadec> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_symlink/work/.bzr/
27.794 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootModifyTricky.test_modify_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 362, in test_modify_directory_becomes_symlink
handler.process(self.file_command_iter(path1, path2, 'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-211'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_file (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_file]
29.483 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_file/work/.bzr/.
29.496 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9ce27ec> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_file/work/.bzr/
29.585 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_file]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 561, in test_rename_directory_becomes_file
handler.process(self.file_command_iter(path1, old_path2, new_path2))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-226'
reason: Entry was at wrong other path 'a/b/c'.
======================================================================
ERROR: test_rename_directory_becomes_symlink (bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky)
vvvv[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_symlink]
29.610 creating repository in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/.
29.626 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x9f2cb0c> in file:///tmp/testbzr-UNn4uA.tmp/bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_symlink/work/.bzr/
29.717 opening working tree '/tmp/testbzr-UNn4uA.tmp'
^^^^[log from bzrlib.plugins.fastimport.tests.test_generic_processor.TestImportToRichRootRenameTricky.test_rename_directory_becomes_symlink]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/naesten/.bazaar/plugins/fastimport/tests/test_generic_processor.py", line 591, in test_rename_directory_becomes_symlink
'symlink'))
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 92, in process
self._process(command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 269, in _process
processor.ImportProcessor._process(self, command_iter)
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 114, in _process
handler(self, cmd)
File "/home/naesten/.bazaar/plugins/fastimport/processors/generic_processor.py", line 459, in commit_handler
handler.process()
File "/home/naesten/.bazaar/plugins/fastimport/processor.py", line 201, in process
self.post_process_files()
File "/home/naesten/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 541, in post_process_files
lambda revision_ids: self._get_inventories(revision_ids))
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 236, in load_using_delta
rev_id, basis_inv, inv_delta, present_parents, parent_invs)
File "/home/naesten/.bazaar/plugins/fastimport/revision_store.py", line 313, in _add_inventory_by_delta
inv_delta, revision_id, parents)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1054, in add_inventory_by_delta
basis_inv.apply_delta(delta)
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 1152, in apply_delta
"Entry was at wrong other path %r." % self.id2path(file_id))
InconsistentDelta: An inconsistent delta was supplied involving u'c', 'abc-20090721040758-h1b2s4qbde1rphbf-230'
reason: Entry was at wrong other path 'a/b/c'.
----------------------------------------------------------------------
Ran 172 tests in 29.664s
FAILED (errors=15)
tests failed
Fixed in rev 187. When deleting a directory, the paths to children were incorrectly being given as relative to the directory being deleted, when they should have been relative to the root instead. This may not have caused any problems in practice prior to bzr r4554 but it certainly caused failures after that, given the stricter inventory delta checking introduced by that change.