changeset 19024:ab04e87a5f3b

amend: fix unlocking order - first lock then wlock
author Mads Kiilerich <madski@unity3d.com>
date Wed, 17 Apr 2013 03:41:08 +0200
parents 86531a7038ed
children 3af92401efb3
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Apr 17 03:40:18 2013 +0200
+++ b/mercurial/cmdutil.py	Wed Apr 17 03:41:08 2013 +0200
@@ -1790,7 +1790,7 @@
     finally:
         if newid is None:
             repo.dirstate.invalidate()
-        lockmod.release(wlock, lock)
+        lockmod.release(lock, wlock)
     return newid
 
 def commiteditor(repo, ctx, subs):