author | Bryan O'Sullivan <bryano@fb.com> |
Tue, 16 Apr 2013 10:08:20 -0700 | |
changeset 18989 | 12a3474c1634 |
parent 18988 | 5bae936764bb |
child 18990 | 7373be706f02 |
--- a/mercurial/revlog.py Tue Apr 16 10:08:20 2013 -0700 +++ b/mercurial/revlog.py Tue Apr 16 10:08:20 2013 -0700 @@ -708,9 +708,6 @@ a, b = self.rev(a), self.rev(b) try: ancs = self.index.ancestors(a, b) - old = ancestor.ancestors(self.parentrevs, a, b) - assert set(ancs) == old, ('opinions differ over ancestor(%d, %d)' % - (a, b)) except (AttributeError, OverflowError): ancs = ancestor.ancestors(self.parentrevs, a, b) if ancs: