Mercurial > evolve

diff tests/test-unstable.t @ 1697:093c445fd86a mercurial-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable through 3.7 branch dropped the topic test and updated output with some minor difference Hg: Enter commit message. Lines beginning with 'HG:' are removed.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 05 May 2016 23:51:35 +0200
parents 61dd08f4dc62 ff0ff0f28a13
children
line wrap: on
line diff
--- a/tests/test-unstable.t	Wed Feb 10 23:44:00 2016 +0000
+++ b/tests/test-unstable.t	Thu May 05 23:51:35 2016 +0200
@@ -156,9 +156,8 @@
   
 
   $ hg evo --all --any --unstable
-  abort: 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)
-  [255]
+  warning: no support for evolving merge changesets with two obsolete parents yet
+  (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one)
   $ hg log -G
   @  5:2db39fda7e2f@default(draft) cprime
   |