Submitter | Pierre-Yves David |
---|---|
Date | Aug. 30, 2019, 4:39 p.m. |
Message ID | <425be1daf1bff57f7526.1567183176@nodosa.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/41442/ |
State | Accepted |
Headers | show |
Comments
Patch
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))