[MERGE] remerge command works on win32

[Martin Pool]

On  4 May 2006, Aaron Bentley <abentley at aaronbentley.com> wrote:
> Martin Pool wrote:
> 
> >The original code here has a bug - it will absorb a KeyboardInterrupt or
> >similar error that happens to arrive during finalization.  Let's try to
> >fix it rather than just moving it around.
> >
> >Probably the tree finalization can be inside a nested try/finally block,
> >so that the lock cleanup will be done even if an error happens in
> >finalization?
> 
> I think my original sentiment was that it would suck to error out 
> because we couldn't clean up the limbo directory, even though the merge 
> had succeeded.
> 
> I can change this, sure.  We may get more errors on Win32, but those 
> errors would have manifested on the next merge/revert command anyhow.

I can understand that.  But remember that exceptions here don't just
mean "I failed to cleanup the limbo directory" in the usual sense, but
also "there's a programming error in the cleanup code" or "the user hit
C-c during cleanup"; in both those cases we should terminate.  I'd
prefer to catch the IOErrors in fairly restricted scopes and report them
with a warning.

-- 
Martin