[MERGE] revert deletes files when it is safe

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> 
> How do you encounter this situation? Where you have a file which needs
> to be removed, but has not changed? By supplying a --revision that comes
> before the file was added?

Right.  By default, target_tree == basis_tree, so any file not present
in target_tree is one that was modified working_tree.  But if you
specify a different target_tree, then this doesn't hold true.

> Anyway, the test would be a little bit clearer if you added some
> whitespace and comments.

Okay.

> v- And you should use:
> self.build_tree_contents([('merge_target/new_file', new_contents')]))
> 
> instead of the try/finally stuff. (As pointed out to me by Robert)

That is not a very intuitive way to achieve that, but okay.

> Otherwise the test seems complete enough, +1 from me.

Thanks for the review.

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

iD8DBQFFGuFj0F+nu1YWqI0RAtX9AJ9zcofRA4ed3ESm8SbJHdwUpwShCACbBRJv
E1Gta4CQXOmhWef+15SAsAQ=
=ViSY
-----END PGP SIGNATURE-----