--- a/hgext/evolve.py	Fri Dec 04 15:28:29 2015 -0800
+++ b/hgext/evolve.py	Fri Dec 11 10:49:29 2015 +0000
@@ -891,7 +891,7 @@
         tr.close()
         return newid, created
     finally:
-        lockmod.release(lock, wlock, tr)
+        lockmod.release(tr, lock, wlock)
 
 class MergeFailure(error.Abort):
     pass