Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hbisect.py @ 20094:06ef32c3b4bb stable
bisect: report "both good and bad" as such, not as "not directly related"
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 10 Nov 2013 18:51:21 +0100 |
| parents | 07771e233cf1 |
| children | 1c46b18b0e1c |
line wrap: on
line diff
--- a/mercurial/hbisect.py Fri Nov 08 11:49:13 2013 +0100 +++ b/mercurial/hbisect.py Sun Nov 10 18:51:21 2013 +0100 @@ -62,7 +62,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: + if (len(state['bad']) == 1 and len(state['good']) == 1 and + state['bad'] != state['good']): raise util.Abort(_("starting revisions are not directly related")) raise util.Abort(_("inconsistent state, %s:%s is good and bad") % (badrev, short(bad)))