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

[Aaron Bentley]

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

Robert Collins wrote:
> 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):

Sure.

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

iD8DBQFGZhMc0F+nu1YWqI0RAjZlAJ96N3NmmJmpcoBrMxosZNhOlaVoOACfTWHz
ur8XPB8i7jMtL1/zJA+ZV38=
=9xiy
-----END PGP SIGNATURE-----