hgext/evolve.py
changeset 1594 de43a3e6b358
parent 1593 2f117c299325
child 1597 7876ed4fceb7
--- a/hgext/evolve.py	Sat Jan 23 06:18:01 2016 +0900
+++ b/hgext/evolve.py	Fri Jan 22 21:41:59 2016 +0900
@@ -965,6 +965,7 @@
             class LocalMergeFailure(MergeFailure, exc.__class__):
                 pass
             exc.__class__ = LocalMergeFailure
+            tr.close() # to keep changes in this transaction (e.g. dirstate)
             raise
         oldbookmarks = repo.nodebookmarks(nodesrc)
         _finalizerelocate(repo, orig, dest, nodenew, tr)