# HG changeset patch # User Pierre-Yves David # Date 1456180564 -3600 # Node ID b966e35aad78dfa3e132291261b7a77f4a0b9ff5 # Parent 7a8c44844f57624a14f31fd30723211522a2b15a unionrepo: properly handle hidden linkrev in revlog (issue5070) The unionrepository have to do some special magic to handle linkrev of the unioned filerev and manifestrev. That logic was done from a repoview and obsolescence marker affecting bundled changeset could lead to a crash. We now ensure we operate on unfiltered repository. diff -r 7a8c44844f57 -r b966e35aad78 mercurial/unionrepo.py --- a/mercurial/unionrepo.py Mon Feb 22 23:34:54 2016 +0100 +++ b/mercurial/unionrepo.py Mon Feb 22 23:36:04 2016 +0100 @@ -211,14 +211,14 @@ @localrepo.unfilteredpropertycache def manifest(self): return unionmanifest(self.svfs, self.repo2.svfs, - self._clrev) + self.unfiltered()._clrev) def url(self): return self._url def file(self, f): return unionfilelog(self.svfs, f, self.repo2.svfs, - self._clrev, self) + self.unfiltered()._clrev, self) def close(self): self.repo2.close()