bzr failed to merge

[Charlie_Smotherman]

Will doing some UDD merges I received this error:

modified man/utils-getS4.Rd
Committed revision 20.
bzr: ERROR: exceptions.AssertionError: parent <email address hidden> has disappeared from ['<email address hidden>']

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4477, in run
    verified)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4496, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 654, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 802, in do_merge
    operation.run()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 132, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 807, in _do_merge
    self._compute_transform()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 830, in _compute_transform
    entries = self._entries3()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 895, in _entries3
    executable) in iterator:
  File "/usr/lib/python2.7/dist-packages/bzrlib/tree.py", line 1180, in iter_changes
    specific_file_ids=specific_file_ids))
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 155, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/tree.py", line 881, in iter_entries_by_dir
    return self.root_inventory.iter_entries_by_dir(
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 1943, in _get_root_inventory
    self._generate_inventory()
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 1804, in _generate_inventory
    self._revision_id, self._dirstate.get_parent_ids()))
AssertionError: parent <email address hidden> has disappeared from ['<email address hidden>']

bzr 2.6b2 on python 2.7.3 (Linux-3.7.0-4-generic-i686-with-
    Ubuntu-13.04-raring)
arguments: ['/usr/bin/bzr', 'merge', '-v', 'lp:~logan/ubuntu/raring/fbasics
    /debian-merge']
plugins: bash_completion[2.6b2], builddeb[2.7.0dev], changelog_merge[2.6b2],
    launchpad[2.6b2], netrc_credential_store[2.6b2], news_merge[2.6b2],
    po_merge[2.6b2], weave_fmt[2.6b2]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'

[Charlie_Smotherman (cjsmo)]

And while attempting to merge klavaro:

modified src/tutor.h
modified src/velocity.c
Committed revision 31.
bzr: ERROR: exceptions.AssertionError: parent <email address hidden> has disappeared from ['<email address hidden>']

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4477, in run
    verified)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4496, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 654, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 802, in do_merge
    operation.run()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 132, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 807, in _do_merge
    self._compute_transform()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 830, in _compute_transform
    entries = self._entries3()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 895, in _entries3
    executable) in iterator:
  File "/usr/lib/python2.7/dist-packages/bzrlib/tree.py", line 1180, in iter_changes
    specific_file_ids=specific_file_ids))
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 155, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/tree.py", line 881, in iter_entries_by_dir
    return self.root_inventory.iter_entries_by_dir(
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 1943, in _get_root_inventory
    self._generate_inventory()
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree_4.py", line 1804, in _generate_inventory
    se...