bisect: better message for unrelated starting revisions stable
authorMatt Mackall <mpm@selenic.com>
Fri, 20 Aug 2010 17:16:37 -0500
branchstable
changeset 12005 c6b1be675d3c
parent 11994 31dde4c3bb83
child 12006 af00e58bd383
child 12008 fad5ed0ff997
bisect: better message for unrelated starting revisions
mercurial/hbisect.py
--- 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)))