Mercurial > hg

changeset 12006:af00e58bd383

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 20 Aug 2010 21:23:47 -0500
parents 1fe4702fe2df (current diff) c6b1be675d3c (diff)
children 652f71b235bf
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hbisect.py	Fri Aug 20 15:31:05 2010 -0500
+++ b/mercurial/hbisect.py	Fri Aug 20 21:23:47 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)))