diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -372,6 +372,10 @@ coreconfigitem('experimental', 'evolution.createmarkers', default=None, ) +coreconfigitem('experimental', 'evolution.effect-flags', + default=False, + alias=[('experimental', 'effect-flags')] +) coreconfigitem('experimental', 'evolution.exchange', default=None, ) @@ -390,9 +394,6 @@ coreconfigitem('experimental', 'nonnormalparanoidcheck', default=False, ) -coreconfigitem('experimental', 'effect-flags', - default=False, -) coreconfigitem('experimental', 'exportableenviron', default=list, ) diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -1077,7 +1077,7 @@ # Effect flag metadata handling saveeffectflag = repo.ui.configbool('experimental', - 'effect-flags') + 'evolution.effect-flags') tr = repo.transaction('add-obsolescence-marker') try: diff --git a/tests/test-obsmarkers-effectflag.t b/tests/test-obsmarkers-effectflag.t --- a/tests/test-obsmarkers-effectflag.t +++ b/tests/test-obsmarkers-effectflag.t @@ -13,7 +13,7 @@ > rebase = > [experimental] > evolution = all - > effect-flags = 1 + > evolution.effect-flags = 1 > EOF $ hg init $TESTTMP/effect-flags