[MERGE] Fix bug 150438

[John Arbash Meinel]

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

Robert Collins wrote:
| This has been biting quite a few users.
|
|  * Deleting directories by hand before running ``bzr rm`` will not
|    cause subsequent errors in ``bzr st`` and ``bzr commit``.
|    (Robert Collins, #150438)
|
| I've also modified the apply_inventory_delta logic for Inventory and the
| current-tree in dirstate to raise on the particular error condition that
| was causing this.
|
| -Rob
|
BB:approve

John
=:->

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

iEYEARECAAYFAkiQhucACgkQJdeBCYSNAANk7ACfZBw7DgpkjjcakzoY7NAuomNI
BtAAnRTE2MbzDzsonGrBik6WubE/Jwdi
=Q1ql
-----END PGP SIGNATURE-----