branch | stable |
changeset 30218 | 1767723f71cf |
parent 28222 | b966e35aad78 |
child 30374 | f2d146d1e8d6 |
--- a/mercurial/unionrepo.py Tue Oct 18 14:27:30 2016 -0500 +++ b/mercurial/unionrepo.py Tue Oct 18 17:32:51 2016 -0700 @@ -208,8 +208,7 @@ node = self.repo2.changelog.node(rev2) return self.changelog.rev(node) - @localrepo.unfilteredpropertycache - def manifest(self): + def _constructmanifest(self): return unionmanifest(self.svfs, self.repo2.svfs, self.unfiltered()._clrev)