diff -r cb52e619c99e -r 7f5410dfc8a6 mercurial/dirstate.py --- a/mercurial/dirstate.py Thu Jan 30 19:16:12 2020 +0100 +++ b/mercurial/dirstate.py Wed Jan 29 11:11:18 2020 +0100 @@ -1849,7 +1849,7 @@ nonnorm, otherparents = self._rustmap.nonnormalentries() return nonnorm - @property + @propertycache def otherparentset(self): nonnorm, otherparents = self._rustmap.nonnormalentries() return otherparents