Mercurial > hg

diff mercurial/hbisect.py @ 7557:21233de9c053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Circumvent removal of valid bisect candidates due to previously skipped ones As reported in issue 1445: A valid candidate revision for a bisect test is not considered for testing due to its skipped ancestor. If this revision is the only untested one left an assertion error occurs.
author Bernhard Leiner <bleiner@gmail.com>
date Sat, 27 Dec 2008 19:05:26 +0100
parents e1afb50ec2aa
children afddc32b2b3f
line wrap: on
line diff
--- a/mercurial/hbisect.py	Wed Dec 31 15:04:18 2008 +0100
+++ b/mercurial/hbisect.py	Sat Dec 27 19:05:26 2008 +0100
@@ -102,7 +102,7 @@
             if value == perfect: # found a perfect candidate? quit early
                 break
 
-        if y < perfect: # all downhill from here?
+        if y < perfect and rev not in skip: # all downhill from here?
             for c in children.get(rev, []):
                 poison[c] = True # poison children
             continue