[MERGE] remerge command works on win32

[Aaron Bentley]

This patch gets the remerge tests passing on win32

Problem 1:
On win32, osutils.rename does not throw ENOENT when you attempt to 
rename a missing file onto the CWD.  Instead, it throws EPERM, whether 
the source is present or not.

Solution: only invoke osutils.rename if the source is present

Problem 2: TreeTransform.create_file doesn't close the target file if 
the input iterator throws an exception.  On Windows, this prevents the 
limbo directory from being rmtree'd.

Solution: close the file using a try/finally block.

Bonus: Merge now emits a warning if it can't finalize a transform.

Aaron
-------------- next part --------------
A non-text attachment was scrubbed...
Name: win32_remerge.patch
Type: text/x-patch
Size: 2138 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060503/e16e5ec1/attachment.bin