Patchwork [4,of,4,resend] revlog: don't cross-check ancestor result against Python version

login
register
mail settings
Submitter Bryan O'Sullivan
Date April 16, 2013, 5:09 p.m.
Message ID <12a3474c163430293c99.1366132166@australite.local>
Download mbox | patch
Permalink /patch/1351/
State Accepted
Commit 12a3474c163430293c99fd21b7745dfb8f9bc04e
Headers show

Comments

Bryan O'Sullivan - April 16, 2013, 5:09 p.m.
# HG changeset patch
# User Bryan O'Sullivan <bryano@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

Patch

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: