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

[Robert Collins]

On Tue, 2007-06-05 at 21:16 -0400, Aaron Bentley wrote:
> -----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.

+1

Minor possible tweak:

+    def test_merge_move_deleted(self):

how about

def test_merge_other_moves_we_deleted(self):

?

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070606/627a004a/attachment.pgp