Error during merge: No final name for trans_id 'new-70'

[David Engster]

I'm using bzr 2.5.1 and am currently getting an error when trying to do
a pretty large merge. You can reproduce this issue as follows:

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

This will abort with the following error:

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

The offending commit in 'trunk' which is causing this error is
rev. 8235, which is a very large merge from another branch and which
surely leads to a criss-cross with many conflicts, but I cannot do
anything about that now, hence I'd appreciate any hints on how to deal
with this error.

-David