[MERGE] handle dangling inventory entries in merge (fixes #82329)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Aaron Bentley ?8H5B:

>>> Okay, I think I see the cause of the bug: contents_conflict is
>>> incorrectly assuming that it should delete the file if it has a file-id,
>>> whether or not the file exists on disk.
>>>
>>> I don't expect this will be hard to fix.
>
> I file bug report: https://bugs.launchpad.net/bzr/+bug/82369

Okay, here's the fix.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFwJHP0F+nu1YWqI0RAqrFAJ9ipTYR/NRHX1UCR8aoXz2Mgn02WwCbBWmE
On7JyKIirBUGYeRB1YSetac=
=1Anp
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-with-dangling.patch
Type: text/x-patch
Size: 2809 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070131/464cef52/attachment.bin