##// END OF EJS Templates
bisect: report "both good and bad" as such, not as "not directly related"
Mads Kiilerich -
r20094:06ef32c3 stable
parent child Browse files
Show More
@@ -62,7 +62,8 b' def bisect(changelog, state):'
62 badrev, ancestors = buildancestors(state['good'], state['bad'])
62 badrev, ancestors = buildancestors(state['good'], state['bad'])
63 bad = changelog.node(badrev)
63 bad = changelog.node(badrev)
64 if not ancestors: # now we're confused
64 if not ancestors: # now we're confused
65 if len(state['bad']) == 1 and len(state['good']) == 1:
65 if (len(state['bad']) == 1 and len(state['good']) == 1 and
66 state['bad'] != state['good']):
66 raise util.Abort(_("starting revisions are not directly related"))
67 raise util.Abort(_("starting revisions are not directly related"))
67 raise util.Abort(_("inconsistent state, %s:%s is good and bad")
68 raise util.Abort(_("inconsistent state, %s:%s is good and bad")
68 % (badrev, short(bad)))
69 % (badrev, short(bad)))
@@ -280,7 +280,7 b' skip'
280 $ hg bisect -r
280 $ hg bisect -r
281 $ hg bisect -g tip
281 $ hg bisect -g tip
282 $ hg bisect -b tip
282 $ hg bisect -b tip
283 abort: starting revisions are not directly related
283 abort: inconsistent state, 31:58c80a7c8a40 is good and bad
284 [255]
284 [255]
285
285
286 $ hg bisect -r
286 $ hg bisect -r
General Comments 0
You need to be logged in to leave comments. Login now