[MERGE] Fix bug 150438

[Robert Collins]

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
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 150438-3589.patch
Type: text/x-patch
Size: 21810 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080730/d211a75f/attachment-0001.bin 
-------------- 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/20080730/d211a75f/attachment-0001.pgp