# HG changeset patch # User Boris Feld # Date 2017-09-28 17:56:40 # Node ID 7f183c643eb696383961091f8703fc0f0bb81098 # Parent 1644623ab09695dfcbcfe61387b875c3448ab490 config: use 'experimental.evolution.allowunstable' Extract 'experimental.evolution' = allowunstable as 'experimental.evolution.allowunstable'. We keep the new option in the 'experimental.evolution' namespace in order to stay coherent with other options ('experimental.evolution.bundle-obsmarker' and 'experimental.evolution.track-operation') ease the renaming as possibly 'evolution.allowunstable'. Differential Revision: https://phab.mercurial-scm.org/D1150 diff --git a/tests/test-amend.t b/tests/test-amend.t --- a/tests/test-amend.t +++ b/tests/test-amend.t @@ -180,8 +180,8 @@ With allowunstable, amend could work in $ cat >> $HGRCPATH < [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > EOF $ hg amend diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -519,8 +519,8 @@ Enable obsolete $ cat >> $HGRCPATH << EOF > [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > EOF Amend with no files changes diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t --- a/tests/test-histedit-arguments.t +++ b/tests/test-histedit-arguments.t @@ -496,8 +496,8 @@ amend should not be blocked by the ongoi $ cat >>$HGRCPATH < [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > EOF $ hg commit --amend -m 'allow this fold' $ hg histedit --continue diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t --- a/tests/test-histedit-obsolete.t +++ b/tests/test-histedit-obsolete.t @@ -8,8 +8,8 @@ Enable obsolete > [phases] > publish=False > [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > [extensions] > histedit= > rebase= diff --git a/tests/test-rebase-brute-force.t b/tests/test-rebase-brute-force.t --- a/tests/test-rebase-brute-force.t +++ b/tests/test-rebase-brute-force.t @@ -3,8 +3,8 @@ > drawdag=$TESTDIR/drawdag.py > bruterebase=$TESTDIR/bruterebase.py > [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > EOF $ init() { > N=`expr ${N:-0} + 1` diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -8,8 +8,8 @@ Enable obsolete > [ui] > logtemplate= {rev}:{node|short} {desc|firstline} > [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > [phases] > publish=False > [extensions] diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t --- a/tests/test-rebase-partial.t +++ b/tests/test-rebase-partial.t @@ -7,8 +7,8 @@ destination (issue5422) > drawdag=$TESTDIR/drawdag.py > > [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > > [alias] > tglog = log -G --template "{rev}: {desc}" diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t --- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -2,8 +2,8 @@ Test uncommit - set up the config $ cat >> $HGRCPATH < [experimental] - > evolution=allowunstable > evolution.createmarkers=True + > evolution.allowunstable=True > [extensions] > uncommit = > drawdag=$TESTDIR/drawdag.py