Mercurial > hg

diff mercurial/merge.py @ 8109:496ae1ea4698

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch lock releasing in the core from gc to explicit
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
date Wed, 22 Apr 2009 02:01:22 +0200
parents 89e05c02a4af
children 08e1baf924ca
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Apr 22 02:01:22 2009 +0200
+++ b/mercurial/merge.py	Wed Apr 22 02:01:22 2009 +0200
@@ -504,4 +504,4 @@
 
         return stats
     finally:
-        del wlock
+        wlock.release()