diff tests/test-evolve-bumped.t @ 3001:67b59d1657cf mercurial-4.2

compat-test: merge future 6.7.0 into 4.2 compat branch Couple feature to disable and other various test impact.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:07:22 +0200
parents bd7e8be29542
children 945a0989e41b
line wrap: on
line diff
--- a/tests/test-evolve-bumped.t	Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-evolve-bumped.t	Wed Sep 27 01:07:22 2017 +0200
@@ -69,7 +69,7 @@
   no changes found
   1 new bumped changesets
 
-  $ hg evolve -a -A --bumped
+  $ hg evolve -a -A --phasedivergent
   recreate:[2] tweak a
   atop:[1] modify a
   computing new diff
@@ -121,5 +121,5 @@
   |
   o  0:d3873e73d99e@default(public) init
   
-  $ hg evolve --all --bumped
+  $ hg evolve --all --phasedivergent
   skipping b28e84916d8c : we do not handle merge yet