[PATCH] Fix for bug #314251 [mv via rm+add breaking dirstate]

[Aaron Bentley]

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

Charles Duffy wrote:
> Attempting a rename via remove followed by an add-by-id causes dirstate
> to become unhappy. This patch allows DirState.add() to handle this case
> cleanly. A test case (which fails without the patch) is included.
> 

This bundle is from a rich-root branch, therefore it's not mergeable.

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

iEYEARECAAYFAklkScsACgkQ0F+nu1YWqI3EcgCfdihLphaAIHSvSv6GpGPLlR9A
6U4An0ZbWXyCL2AEfGnGF0cAgkLPV6/t
=pSJf
-----END PGP SIGNATURE-----