# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1366162868 -7200
# Node ID ab04e87a5f3bcee588b72d615e1aeb42f10d3b99
# Parent  86531a7038edc8bf520c8269565a86259506e68d
amend: fix unlocking order - first lock then wlock

diff -r 86531a7038ed -r ab04e87a5f3b mercurial/cmdutil.py
--- 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):