Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 19024:ab04e87a5f3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: fix unlocking order - first lock then wlock
author Mads Kiilerich <madski@unity3d.com>
date Wed, 17 Apr 2013 03:41:08 +0200
parents c1af1fb314bc
children bd19587a3347
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):