diff mercurial/commands.py @ 12178:1ef9b0b5efec

bisect: warn about ending on a merge with only one side marked
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 08 Sep 2010 13:48:25 +0200
parents 80399b5b5f13
children 1447d3a9ff4a
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Sep 08 12:53:15 2010 +0200
+++ b/mercurial/commands.py	Wed Sep 08 13:48:25 2010 +0200
@@ -336,6 +336,15 @@
             else:
                 ui.write(_("The first bad revision is:\n"))
             displayer.show(repo[nodes[0]])
+            parents = repo[nodes[0]].parents()
+            if len(parents) > 1:
+                side = state['bad'] if good else state['good']
+                num = len(set(i.node() for i in parents) & set(side))
+                if num == 1:
+                    common = parents[0].ancestor(parents[1])
+                    ui.write(_('Not all ancestors of this changeset have been'
+                               ' checked.\nTo check the other ancestors, start'
+                               ' from the common ancestor, %s.\n' % common))
         else:
             # multiple possible revisions
             if good: