evolve: report merge node
When running evolve --any, evolve will report that it can not
handle a merge node. In order for this to be helpful, we report
the revision so that a user could fix t.
--- a/hgext/evolve.py Thu Apr 14 15:02:10 2016 +0000
+++ b/hgext/evolve.py Thu Apr 14 15:03:18 2016 +0000
@@ -1876,8 +1876,8 @@
if not pctx.obsolete():
pctx = orig.p2() # second parent is obsolete ?
elif orig.p2().obsolete():
- hint = _("Redo the merge and use `hg prune <old> "
- "--succ <new>` to obsolete the old one")
+ hint = _("Redo the merge (%s) and use `hg prune <old> "
+ "--succ <new>` to obsolete the old one") % orig.hex()[:12]
ui.warn(_("warning: no support for evolving merge changesets "
"with two obsolete parents yet\n") +
_("(%s)\n") % hint)
--- a/tests/test-unstable.t Thu Apr 14 15:02:10 2016 +0000
+++ b/tests/test-unstable.t Thu Apr 14 15:03:18 2016 +0000
@@ -155,7 +155,7 @@
$ hg evo --all --any --unstable
warning: no support for evolving merge changesets with two obsolete parents yet
- (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one)
+ (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one)
$ hg log -G
@ 5:2db39fda7e2f@default(draft) cprime
|