branch | stable |
changeset 12005 | c6b1be675d3c |
parent 10263 | 25e572394f5c |
child 12067 | a4fbbe0fbc38 |
--- a/mercurial/hbisect.py Thu Aug 19 15:04:21 2010 -0400 +++ b/mercurial/hbisect.py Fri Aug 20 17:16:37 2010 -0500 @@ -61,6 +61,8 @@ badrev, ancestors = buildancestors(state['good'], state['bad']) bad = changelog.node(badrev) if not ancestors: # now we're confused + if len(state['bad']) == 1 and len(state['good']) == 1: + raise util.Abort(_("starting revisions are not directly related")) raise util.Abort(_("Inconsistent state, %s:%s is good and bad") % (badrev, short(bad)))