Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: take locks in the right order
authorMads Kiilerich <mads@kiilerich.com>
Fri, 13 Jan 2012 01:19:07 +0100
changeset 15874 2305baff673f
parent 15873 a153a86a472c
child 15875 7eca9db689d6
rebase: take locks in the right order repo.lock was taken before repo.wlock - that could in principle cause a deadlock.
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial