Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 34872:29f52e7966dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 28fd13076962
children e3fbf8e3fef2
line wrap: on
line diff
--- a/mercurial/configitems.py	Tue Oct 17 15:57:56 2017 +0200
+++ b/mercurial/configitems.py	Tue Oct 17 16:54:31 2017 +0200
@@ -300,9 +300,6 @@
 coreconfigitem('email', 'reply-to',
     default=None,
 )
-coreconfigitem('experimental', 'allowdivergence',
-    default=False,
-)
 coreconfigitem('experimental', 'archivemetatemplate',
     default=dynamicdefault,
 )
@@ -348,6 +345,10 @@
 coreconfigitem('experimental', 'evolution',
     default=list,
 )
+coreconfigitem('experimental', 'evolution.allowdivergence',
+    default=False,
+    alias=[('experimental', 'allowdivergence')]
+)
 coreconfigitem('experimental', 'evolution.allowunstable',
     default=None,
 )