changeset 26472 | 406a654b41cb |
parent 26449 | 89b7a7883aee |
child 26475 | efd57cd6fd1d |
--- a/mercurial/localrepo.py Sun Oct 04 12:11:44 2015 -0700 +++ b/mercurial/localrepo.py Sun Oct 04 19:28:43 2015 -0700 @@ -1214,6 +1214,8 @@ def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc, parentenvvar=None): parentlock = None + # the contents of parentenvvar are used by the underlying lock to + # determine whether it can be inherited if parentenvvar is not None: parentlock = os.environ.get(parentenvvar) try: