Mercurial > hg

diff tests/test-rebase-conflicts.t @ 34865:a0100f34e20b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: replace experimental.stabilization by experimental.evolution We replace 'experimental.stabilization=all' by 'experimental.evolution=true' as we will extract individual config in their own config in later patches. Differential Revision: https://phab.mercurial-scm.org/D1148
author Boris Feld <boris.feld@octobus.net>
date Tue, 17 Oct 2017 11:29:26 +0200
parents eb586ed5d8ce
children b9bdee046cc2
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Mon Oct 16 17:14:47 2017 +0200
+++ b/tests/test-rebase-conflicts.t	Tue Oct 17 11:29:26 2017 +0200
@@ -397,7 +397,7 @@
   $ hg update E -q
   $ echo 3 > B
   $ hg commit --amend -m E -A B -q
-  $ hg rebase -r B+D -d . --config experimental.stabilization=all
+  $ hg rebase -r B+D -d . --config experimental.evolution=true
   rebasing 1:112478962961 "B" (B)
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
@@ -408,7 +408,7 @@
   $ hg resolve -m
   (no more unresolved files)
   continue: hg rebase --continue
-  $ hg rebase --continue --config experimental.stabilization=none
+  $ hg rebase --continue --config experimental.evolution=none
   rebasing 1:112478962961 "B" (B)
   rebasing 3:f585351a92f8 "D" (D)
   warning: orphaned descendants detected, not stripping 112478962961