Mercurial > hg
changeset 12005:c6b1be675d3c stable
bisect: better message for unrelated starting revisions
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 20 Aug 2010 17:16:37 -0500 |
| parents | 31dde4c3bb83 |
| children | af00e58bd383 fad5ed0ff997 |
| files | mercurial/hbisect.py |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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)))