changeset 41372 | 390ef056081b |
parent 41365 | 876494fd967d |
child 41529 | 13a6dd952ffe |
--- a/mercurial/localrepo.py Thu Jan 24 16:16:10 2019 -0800 +++ b/mercurial/localrepo.py Thu Jan 24 16:25:19 2019 -0800 @@ -2011,8 +2011,7 @@ self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) self.invalidate() - parentgone = (parents[0] not in self.changelog.nodemap or - parents[1] not in self.changelog.nodemap) + parentgone = any(p not in self.changelog.nodemap for p in parents) if parentgone: # prevent dirstateguard from overwriting already restored one dsguard.close()