[PATCH 4 of 4 resend] revlog: don't cross-check ancestor result against Python version
Bryan O'Sullivan
bos at serpentine.com
Tue Apr 16 12:09:26 CDT 2013
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1366132100 25200
# Tue Apr 16 10:08:20 2013 -0700
# Node ID 12a3474c163430293c99fd21b7745dfb8f9bc04e
# Parent 5bae936764bb74aee13375a826e5da7b02990df1
revlog: don't cross-check ancestor result against Python version
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -708,9 +708,6 @@ class revlog(object):
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:
More information about the Mercurial-devel
mailing list