[MERGE] remerge command works on win32

[Martin Pool]

On  3 May 2006, Aaron Bentley <abentley at aaronbentley.com> wrote:

> === modified file 'a/bzrlib/merge.py'
> --- a/bzrlib/merge.py	
> +++ b/bzrlib/merge.py	
> @@ -395,7 +395,8 @@
>          finally:
>              try:
>                  self.tt.finalize()
> -            except:
> +            except Exception, e:
> +                warn("Couldn't finalize transform: %s" % e)
>                  pass
>              working_tree.unlock()
>              self.pb.clear()

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?


-- 
Martin