diff -r de5a52e5eb9e -r c545d51c901e mercurial/lock.py
--- a/mercurial/lock.py	Thu Sep 24 16:00:41 2015 -0700
+++ b/mercurial/lock.py	Thu Sep 24 16:03:26 2015 -0700
@@ -204,10 +204,11 @@
                 if self.releasefn:
                     self.releasefn()
             finally:
-                try:
-                    self.vfs.unlink(self.f)
-                except OSError:
-                    pass
+                if not self._parentheld:
+                    try:
+                        self.vfs.unlink(self.f)
+                    except OSError:
+                        pass
             for callback in self.postrelease:
                 callback()