[MERGE] don't invoke os.rename on children with no contents

[Aaron Bentley]

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

Hi all,

I found a corner-case bug in my TreeTransform changes:  you can't cancel
the contents of a child, then cancel the contents of its parent.  Fix
attached.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGZeT20F+nu1YWqI0RAvB1AJ48Lla1BNLzf34ATSsng5SysMG3wgCeJD8H
Z1iJuXqaYFl/E6lz6DQA+ZM=
=QJnq
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fast-checkout2.patch
Type: text/x-patch
Size: 2282 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070605/e72b911b/attachment.bin