Crash while merging in bzr 0.1.1

[John Eckerdal]

Hi,

I am seeing a crash when trying to merge one branch to another.
There are several versions in the two branches and I have been playing
with bzr for a while now.
Previously there was an issue when a file was removed from one branch
that was later modified in the other but that specific problem was
solved a few versions ago. However the first item in the backtrace
below points to something similar ("not in inventory") (although this
may be wrong since I am not familiar with the bzr internals).

It should be noted that both branches was created with bzr-0.0.7 and
the upgraded to bzr-0.1 (and I am now running bzr-0.1.1):

The backtrace:

pwd: /home/test/test
file_id {cvsignore-20050829233412-8f3c675d3c08c5f6} not in inventory
Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
639, in run_bzr_catch_errors
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
624, in run_bzr
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
283, in run_argv
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 1268, in run
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 399, in merge
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 435,
in merge_inner
  File "/usr/lib/python2.4/site-packages/bzrlib/merge_core.py", line
97, in merge_flex
  File "/usr/lib/python2.4/site-packages/bzrlib/merge_core.py", line
123, in make_merge_changeset
  File "/usr/lib/python2.4/site-packages/bzrlib/merge_core.py", line
234, in make_merged_contents
  File "/usr/lib/python2.4/site-packages/bzrlib/merge_core.py", line
203, in get_contents
  File "/usr/lib/python2.4/site-packages/bzrlib/merge_core.py", line
208, in get_id_contents
  File "/usr/lib/python2.4/site-packages/bzrlib/inventory.py", line
832, in __getitem__
BzrError: file_id {cvsignore-20050829233412-8f3c675d3c08c5f6} not in inventory

Not sure what more information you need here. If there is more I will
try to provide it

Thanks in advance,
John