[MERGE] #303568: tree lock is not released after a failing attempt at shelving an unversioned file

[Martin Pool]

Martin Pool has voted resubmit.
Status is now: Resubmit
Comment:
I agree with John, it does seem like you need to defer this until the 
iterator is run.

The name 'finalize' seems to imply you can run it from a finally block 
which would be cleaner than a bare except block.

Is there maybe also a blackbox test for unshelve where you could add a 
test for this case.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C20090302222937.GA25259%40localdomain%3E
Project: Bazaar