[MERGE] Merge handles renamed-and-deleted files correctly (Bug #110279)

[Aaron Bentley]

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

Hi all,

This fixes Merge3Merger.cook_conflicts to correctly handle conflicts
where a file is deleted in the local tree, but renamed in the remote branch.

Yes, it's a long-standing bug, resolved with a one-liner.  My apologies.
 It took me a long time to realize that it was actually correct to have
the parent-id set to non-None, while the name was set to None.

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

iD8DBQFGZgsA0F+nu1YWqI0RArunAJ9wvIihdiwzhqvRY46WEC8ISfxRUQCdEH8N
i5cF7WSby/3MFD3bwXP2LSA=
=QI6V
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-deleted-renamed-file.patch
Type: text/x-patch
Size: 3581 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070605/e2e39edf/attachment.bin