##// END OF EJS Templates
Circumvent removal of valid bisect candidates due to previously skipped ones...
Bernhard Leiner -
r7557:21233de9 default
parent child Browse files
Show More
@@ -102,7 +102,7 b' def bisect(changelog, state):'
102 if value == perfect: # found a perfect candidate? quit early
102 if value == perfect: # found a perfect candidate? quit early
103 break
103 break
104
104
105 if y < perfect: # all downhill from here?
105 if y < perfect and rev not in skip: # all downhill from here?
106 for c in children.get(rev, []):
106 for c in children.get(rev, []):
107 poison[c] = True # poison children
107 poison[c] = True # poison children
108 continue
108 continue
@@ -72,3 +72,13 b' hg bisect -s'
72 echo % test no action
72 echo % test no action
73 hg bisect -r
73 hg bisect -r
74 hg bisect || echo failure
74 hg bisect || echo failure
75
76 echo % reproduce AssertionError, issue1445
77 hg bisect -r
78 hg bisect -b 6
79 hg bisect -g 0
80 hg bisect -s
81 hg bisect -s
82 hg bisect -s
83 hg bisect -s
84 hg bisect -g
@@ -286,3 +286,20 b' summary: msg 2'
286 % test no action
286 % test no action
287 abort: cannot bisect (no known good revisions)
287 abort: cannot bisect (no known good revisions)
288 failure
288 failure
289 % reproduce AssertionError, issue1445
290 Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
291 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
292 Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
294 Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
295 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
296 Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
297 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
298 Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
300 The first bad revision is:
301 changeset: 6:a3d5c6fdf0d3
302 user: test
303 date: Thu Jan 01 00:00:06 1970 +0000
304 summary: msg 6
305
General Comments 0
You need to be logged in to leave comments. Login now