--- a/hgext/evolve.py Wed Jun 24 20:17:57 2015 -0700
+++ b/hgext/evolve.py Wed Jun 24 20:23:41 2015 -0700
@@ -2036,13 +2036,13 @@
displayer.show(c)
result = 0
elif children:
+ ui.warn("ambigious next changeset:\n")
for c in children:
displayer.show(c)
- ui.warn(_('multiple non-obsolete children, '
- 'explicitly update to one of them\n'))
+ ui.warn(_('explicitly update to one of them\n'))
result = 1
else:
- ui.warn(_('no non-obsolete children\n'))
+ ui.warn(_('no children\n'))
result = 1
return result