'No final name for trans_id' during merge

[David Engster]

I was already bitten by this bug once, see

http://article.gmane.org/gmane.comp.version-control.bazaar-ng.general/74586

and now it has happened again; I'm getting this error during merge:

bzr: ERROR: No final name for trans_id 'new-247'
file-id: None
root trans-id: 'new-0'

I'm guessing it is again because of changes on files which are deleted
in the other branch. You should be able to reproduce this by doing

bzr init-repo cedet
cd cedet
bzr branch bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/trunk
bzr branch bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/to-emacs
cd to-emacs
bzr merge ../trunk

I'm using Debian 7 (Wheezy), which ships with

Bazaar (bzr) 2.6.0dev2
  Python interpreter: /usr/bin/python 2.7.3
  Python standard library: /usr/lib/python2.7
  Platform: Linux-3.2.0-4-686-pae-i686-with-debian-7.0
  bzrlib: /usr/lib/python2.7/dist-packages/bzrlib

Any help on how to circumvent this is appreciated. Of course, if someone
could actually *fix* this in Bazaar, now that would be splendid...

-David