diff tests/test-evolve.t @ 1746:343298df3f26 mercurial-3.9

integrate code update and test change from future 5.5 code

This prove that the code is compatible with 3.9

--- a/tests/test-evolve.t	Fri Oct 28 15:43:21 2016 +0200
+++ b/tests/test-evolve.t	Fri Oct 28 16:03:00 2016 +0200
@@ -112,13 +112,13 @@
 test kill and immutable changeset
 
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
-  1 public stable
+  1 public 
   $ hg prune 1
   abort: cannot prune immutable changeset: 7c3bad9141dc
   (see "hg help phases" for details)
   [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
-  1 public stable
+  1 public 
 
 test simple kill
 
@@ -598,7 +598,7 @@
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
-  7:a5bfd90a2f29 stable
+  7:a5bfd90a2f29 
   $ echo 3 > 1
   $ hg resolve -m 1
   (no more unresolved files)