Mercurial > evolve

diff tests/test-unstable.t @ 1639:ff0ff0f28a13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author timeless@gmail.com
date Thu, 14 Apr 2016 15:03:18 +0000
parents 5b7596805f7f
children 093c445fd86a 9f42f819267b
line wrap: on
line diff
--- 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
   |