Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 07 Jun 2009 19:16:14 +0200
changeset 564 1ce04b8decf2
parent 562 b1aa7b64890b (current diff)
parent 563 353fad43ad99 (diff)
child 565 3f3c9472c0b6
child 568 060df226baff
Merge with stable
--- a/hgkw/keyword.py	Sun Jun 07 19:07:29 2009 +0200
+++ b/hgkw/keyword.py	Sun Jun 07 19:16:14 2009 +0200
@@ -484,7 +484,7 @@
                     repo.hook('commit', node=n, parent1=_p1, parent2=_p2)
                 return n
             finally:
-                del wlock, lock
+                release(lock, wlock)
 
     # monkeypatches
     def kwpatchfile_init(orig, self, ui, fname, opener, missing=False):