crash when conflicting metadata-only change with deletion

[Martin Pool]

This just happened to me. I don't think it's too hard to handle properly.

hope% mkdir a
hope% bzr init a
hope% cd a
hope% ls
hope% date>foo
hope% bzr add
bzr added foo
hope% bzr commit -m 'add foo'
hope% bzr branch . ../b
hope% rm foo
hope% bzr commit -m 'remove foo'
hope% ../b
hope% ls
foo
hope% chmod +x foo
hope% bzr st
modified:
  foo*
hope% bzr diff
bzr === modified file 'foo' (properties changed)
zsh: exit 1 bzr diff
hope% bzr commit -m 'exec foo'
hope% cd ../a
hope% bzr merge ../b
bzr: ERROR: exceptions.KeyError: 'foo-20051116072309-59a682a7566ad693'
  at /home/mbp/lib/python/bzrlib/changeset.py line 1211
  in apply_changeset
**** entering debugger
> /home/mbp/lib/python/bzrlib/changeset.py(1211)apply_changeset()
-> path = os.path.join(dir, inventory[entry.id])
(Pdb) q
zsh: exit 3 bzr merge ../b

[Aaron Bentley (abentley)]

We are now using totally different code for this.

[Martin Pool (mbp)]

I think this is now in mainline for 0.8