Mercurial > hg
comparison mercurial/hbisect.py @ 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 | 25e572394f5c |
children | a4fbbe0fbc38 |
comparison
equal
deleted
inserted
replaced
11994:31dde4c3bb83 | 12005:c6b1be675d3c |
---|---|
59 if not ancestors: # looking for bad to good transition? | 59 if not ancestors: # looking for bad to good transition? |
60 good = 1 | 60 good = 1 |
61 badrev, ancestors = buildancestors(state['good'], state['bad']) | 61 badrev, ancestors = buildancestors(state['good'], state['bad']) |
62 bad = changelog.node(badrev) | 62 bad = changelog.node(badrev) |
63 if not ancestors: # now we're confused | 63 if not ancestors: # now we're confused |
64 if len(state['bad']) == 1 and len(state['good']) == 1: | |
65 raise util.Abort(_("starting revisions are not directly related")) | |
64 raise util.Abort(_("Inconsistent state, %s:%s is good and bad") | 66 raise util.Abort(_("Inconsistent state, %s:%s is good and bad") |
65 % (badrev, short(bad))) | 67 % (badrev, short(bad))) |
66 | 68 |
67 # build children dict | 69 # build children dict |
68 children = {} | 70 children = {} |