[Success!] [MERGE] check for duplicate file-ids in Inventory.apply_delta()

[Bundle Buggy]

This change has been merged.
Previous status: Conditionally approved

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49B4B11C.2000704%40internode.on.net%3E
Project: Bazaar