branch | stable |
changeset 44826 | 35b255e474d9 |
parent 44687 | 1b8fd4af3318 |
child 44852 | fd3b94f1712d |
--- a/mercurial/localrepo.py Mon May 11 16:44:11 2020 +0200 +++ b/mercurial/localrepo.py Mon May 11 13:08:02 2020 +0200 @@ -1450,6 +1450,8 @@ @storecache(b'00changelog.i') def changelog(self): + # load dirstate before changelog to avoid race see issue6303 + self.dirstate.prefetch_parents() return self.store.changelog(txnutil.mayhavepending(self.root)) @storecache(b'00manifest.i')