# HG changeset patch # User Pierre-Yves David # Date 2019-08-30 16:10:00 # Node ID a61a8f78da284984961a61746749a5128414a4c8 # Parent 3e2520acf17b4094148ae14d30c031bdacc793df unionrepo: use normal inheritance scheme to call revdiff diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py --- a/mercurial/unionrepo.py +++ b/mercurial/unionrepo.py @@ -89,7 +89,7 @@ class unionrevlog(revlog.revlog): self.revlog2.rev(self.node(rev1)), self.revlog2.rev(self.node(rev2))) elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: - return self.baserevdiff(rev1, rev2) + return super(unionrevlog, self).revdiff(rev1, rev2) return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2))