[MERGE] [BUG 363837] catch rmtree failure in diff and mutter to logfile

[martitzam at gmail.com]

An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090511/3eb45a37/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 270 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090511/3eb45a37/attachment.pgp 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 363837_A.patch
Type: text/x-patch
Size: 1104 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090511/3eb45a37/attachment.bin