merge crash when nothing to merge: bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent'

[OBaeko]

I merge just a few minutes ago, and wanted to do it one more time just in case.

openerp@erp6:~/6.0/server$ bzr merge --force
Merging from remembered parent location bzr+ssh://bazaar.launchpad.net/~openerp/openobj ect-server/6.0/
bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent'

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853, in exception_to _return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_ali ases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_clea nups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3822, in run
    verified)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3839, in _do_merge
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 658, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_clea nups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 629, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 769, in do_merge
    operation.run()
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_clea nups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 775, in _do_merge
    self._compute_transform()
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 817, in _compute_transf orm
    file_status = self._do_merge_contents(file_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1336, in _do_merge_cont ents
    set_version=True)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1502, in _dump_conflict s
    suffix, lines, filter_tree_path)
  File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1515, in _conflict_file
    filter_tree_path)
  File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2539, in create_fro m_tree
    raise AssertionError('Unknown kind %r' % kind)
AssertionError: Unknown kind 'absent'

bzr 2.1.2 on python 2.6.6 (Linux-2.6.32-5-xen-686-i686-with-debian-6.0.2)
arguments: ['/usr/bin/bzr', 'merge', '--force']
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: 'C'
plugins:
  bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.1.0]
  launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.1.2 ]
  netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credenti al_store [2.1.2]
  news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.1. 2]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

[Martin Pool (mbp)]

duplicate 336618