merge with stable

merge with stable

--- 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)))