diff tests/test-unstable.t @ 1608:e359d33856c3 mercurial-3.4

merge with new stable through 3.5 and 3.6

--- a/tests/test-unstable.t	Thu Feb 04 11:01:35 2016 +0000
+++ b/tests/test-unstable.t	Thu Feb 11 00:32:40 2016 +0000
@@ -100,23 +100,21 @@
   o  0:b4952fcf48cf@default(draft) add base
   
 
-  $ hg evo --all --any --unstable
-  move:[3] merge
-  atop:[4] aprime
-  abort: no support for evolving merge changesets yet
-  (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one)
-  [255]
-  $ hg log -G
-  @  4:47127ea62e5f@default(draft) aprime
-  |
-  | o    3:6b4280e33286@default(draft) merge
-  | |\
-  +---o  2:474da87dd33b@default(draft) add _c
-  | |
-  | x  1:b3264cec9506@default(draft) add _a
-  |/
-  o  0:b4952fcf48cf@default(draft) add base
-  
+# Unsupported before 3.7
+# 
+#   $ hg evo --all --any --unstable
+#   move:[3] merge
+#   atop:[4] aprime
+#   working directory is now at 0bf3f3a59c8c
+#   $ hg log -G
+#   @    5:0bf3f3a59c8c@default(draft) merge
+#   |\
+#   | o  4:47127ea62e5f@default(draft) aprime
+#   | |
+#   o |  2:474da87dd33b@default(draft) add _c
+#   |/
+#   o  0:b4952fcf48cf@default(draft) add base
+#   
 
   $ cd ..
 
@@ -158,9 +156,7 @@
   
 
   $ hg evo --all --any --unstable
-  move:[3] merge
-  atop:[5] cprime
-  abort: no support for evolving merge changesets yet
+  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]
   $ hg log -G