Mercurial > hg
diff tests/test-rebase-obsolete.t @ 34872:29f52e7966dd
config: gather allowdivergence under the evolution namespace
Grouping all evolution related-config under the experimental.evolution
namespace would helps the future migration outside [experimental].
Differential Revision: https://phab.mercurial-scm.org/D1155
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 17 Oct 2017 16:54:31 +0200 |
parents | 64f29fff1877 |
children | a7e49a5b3e6f |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Tue Oct 17 15:57:56 2017 +0200 +++ b/tests/test-rebase-obsolete.t Tue Oct 17 16:54:31 2017 +0200 @@ -826,7 +826,7 @@ orphan: 1 changesets $ hg rebase -s 10 -d 12 abort: this rebase will cause divergences from: 121d9e3bc4c6 - (to force the rebase please set experimental.allowdivergence=True) + (to force the rebase please set experimental.evolution.allowdivergence=True) [255] $ hg log -G @ 14:73568ab6879d bar foo @@ -845,9 +845,9 @@ | o 0:4a2df7238c3b A -With experimental.allowdivergence=True, rebase can create divergence +With experimental.evolution.allowdivergence=True, rebase can create divergence - $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True + $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True rebasing 10:121d9e3bc4c6 "P" rebasing 14:73568ab6879d "bar foo" (tip) $ hg summary