diff -r 4c0d4bbdc395 -r a2ae27993e16 mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Jan 11 14:55:31 2019 +0100 +++ b/mercurial/localrepo.py Sat Dec 29 23:09:07 2018 -0800 @@ -1261,12 +1261,6 @@ narrowspec.save(self, newincludes, newexcludes) narrowspec.copytoworkingcopy(self) self.invalidate(clearfilecache=True) - # So the next access won't be considered a conflict - # TODO: It seems like there should be a way of doing this that - # doesn't involve replacing these attributes. - self.narrowpats = newincludes, newexcludes - self._narrowmatch = narrowspec.match(self.root, include=newincludes, - exclude=newexcludes) def __getitem__(self, changeid): if changeid is None: