Mercurial > hg

changeset 15874:2305baff673f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: take locks in the right order repo.lock was taken before repo.wlock - that could in principle cause a deadlock.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 13 Jan 2012 01:19:07 +0100
parents a153a86a472c
children 7eca9db689d6
files hgext/rebase.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Jan 11 01:56:05 2012 +0100
+++ b/hgext/rebase.py	Fri Jan 13 01:19:07 2012 +0100
@@ -115,8 +115,8 @@
 
     lock = wlock = None
     try:
+        wlock = repo.wlock()
         lock = repo.lock()
-        wlock = repo.wlock()
 
         # Validate input and define rebasing points
         destf = opts.get('dest', None)