bzr merge-upstream --version 0.6.9 http://edge.launchpad.net/desktopcouch/trunk/0.6.9/+download/desktopcouch-0.6.9.tar.gz lp:desktopcouch -Derror
Using distribution maverick
bzr: ERROR: bzrlib.errors.InconsistentDelta: An inconsistent delta was supplied involving 'desktopcouch/notes', 'notes-20091009221416-dhbnqvigo5boot0s-14'
reason: The file id was deleted but its children were not deleted.
Traceback (most recent call last):
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 911, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 1111, in run_bzr
ret = run(*run_argv)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 689, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 704, in run
return self._operation.run_simple(*args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/home/jw2328/.bazaar/plugins/builddeb/cmds.py", line 714, in run
merge_type, force)
File "/home/jw2328/.bazaar/plugins/builddeb/cmds.py", line 550, in _do_merge
merge_type=merge_type, force=force)
File "/home/jw2328/.bazaar/plugins/builddeb/import_dsc.py", line 1526, in merge_upstream
upstream_revision=upstream_revision)
File "/home/jw2328/.bazaar/plugins/builddeb/import_dsc.py", line 976, in import_upstream
target_tree=target_tree)
File "/home/jw2328/.bazaar/plugins/builddeb/bzrtools_import.py", line 200, in import_dir
target_tree=target_tree)
File "/home/jw2328/.bazaar/plugins/builddeb/bzrtools_import.py", line 209, in import_archive
target_tree=target_tree)
File "/home/jw2328/.bazaar/plugins/builddeb/bzrtools_import.py", line 359, in _import_archive
tt.apply()
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/transform.py", line 1570, in apply
self._tree.apply_inventory_delta(inventory_delta)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/mutabletree.py", line 49, in tree_write_locked
return unbound(self, *args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/workingtree_4.py", line 1263, in apply_inventory_delta
state.update_by_delta(changes)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/dirstate.py", line 1354, in update_by_delta
self._apply_removals(removals.iteritems())
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/dirstate.py", line 1403, in _apply_removals
"The file id was deleted but its children were "
InconsistentDelta: An inconsistent delta was supplied involving 'desktopcouch/notes', 'notes-20091009221416-dhbnqvigo5boot0s-14'
reason: The file id was deleted but its children were not deleted.
