support deletes in CommitBuilder.record_iter_changes

[Jelmer Vernooij]

_StringException: Text attachment: log
------------
185.992 creating config directory: '/tmp/testbzr-xZBdDl.tmp/bzrlib.tests.per_branch.test_iter_merge_sorted_revisions.TestIterMergeSortedRevisionsSimpleGraph.test_merge_sorted_range_start_only(SvnBranchFormat)/home/.bazaar'
INFO Initialising Subversion metadata cache in /tmp/testbzr-xZBdDl.tmp/bzrlib.tests.per_branch.test_branch.TestBound.test_bind_diverged(SvnBranchFormat)/home/.cache/bazaar/svn/ee458ae0-8eb6-4816-9ab5-0b2b38ca32e6.
186.020 potential branching layouts: [('root', 1)]
186.020 Guessed repository layout: RootLayout(), guess layout to use: RootLayout()
186.082 preparing to commit
186.087 Selecting files for commit with filter None
186.087 aborting commit write group because of exception:
186.087 Traceback (most recent call last):
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/commit.py", line 417, in _commit
self._update_builder_with_changes()
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/commit.py", line 661, in _update_builder_with_changes
self.work_tree, self.basis_revid, iter_changes):
File "/home/jelmer/bzr-alltests/plugins/svn/commit.py", line 920, in record_iter_changes
new_ie = entry_factory[new_kind](file_id, new_name, new_parent_id)
KeyError: None

INFO aborting commit write group: KeyError(None,)
186.128 opening working tree '/tmp/testbzr-xZBdDl.tmp'
------------
Text attachment: traceback-1
------------
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/testtools/runtest.py", line 169, in _run_user
return fn(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 468, in _run_setup
ret = self.setUp()
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py", line 32, in setUp
builder = self.make_builder_with_merges('.')
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py", line 51, in make_builder_with_merges
('add', ('', 'TREE_ROOT', 'directory', '')),])
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/branchbuilder.py", line 254, in build_snapshot
message_callback=message_callback)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/branchbuilder.py", line 113, in _do_commit
**kwargs)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/decorators.py", line 208, in write_locked
result = unbound(self, *args, **kwargs)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/mutabletree.py", line 213, in commit
*args, **kwargs)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/commit.py", line 286, in commit
possible_master_transports=possible_master_transports)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/cleanup.py", line 131, in run
self.cleanups, self.func, self, *args, **kwargs)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/commit.py", line 417, in _commit
self._update_builder_with_changes()
File "/home/jelmer/bzr-alltests/bzr.dev/bzrlib/commit.py", line 661, in _update_builder_with_changes
self.work_tree, self.basis_revid, iter_changes):
File "/home/jelmer/bzr-alltests/plugins/svn/commit.py", line 920, in record_iter_changes
new_ie = entry_factory[new_kind](file_id, new_name, new_parent_id)
KeyError: None
------------