Mercurial > hg-stable

changeset 10087:b1982715c435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Dec 2009 16:46:12 -0600
parents 3f3f9c5bbe2b (current diff) e388f5ee7bf5 (diff)
children ec8304e66ea5 a43ae5777221
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/hg.py	Wed Dec 16 22:58:57 2009 +0100
+++ b/hgext/convert/hg.py	Wed Dec 16 16:46:12 2009 -0600
@@ -61,8 +61,10 @@
 
     def after(self):
         self.ui.debug('run hg sink post-conversion action\n')
-        self.lock.release()
-        self.wlock.release()
+        if self.lock:
+            self.lock.release()
+        if self.wlock:
+            self.wlock.release()
 
     def revmapfile(self):
         return os.path.join(self.path, ".hg", "shamap")