diff mercurial/configitems.py @ 48695:e845537f6adb

branching: merge stable into default
author Rapha?l Gom?s <rgomes@octobus.net>
date Wed, 02 Feb 2022 17:24:05 +0100
parents 7ee07e1a25c0 f7086f6173f8
children 568f63b5a30f
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Jan 26 15:32:18 2022 -0800
+++ b/mercurial/configitems.py	Wed Feb 02 17:24:05 2022 +0100
@@ -1277,9 +1277,10 @@
     # Enable this dirstate format *when creating a new repository*.
     # Which format to use for existing repos is controlled by .hg/requires
     b'format',
-    b'exp-rc-dirstate-v2',
+    b'use-dirstate-v2',
     default=False,
     experimental=True,
+    alias=[(b'format', b'exp-rc-dirstate-v2')],
 )
 coreconfigitem(
     b'format',
@@ -1851,7 +1852,7 @@
     default=b'skip',
     experimental=True,
 )
-# experimental as long as format.exp-rc-dirstate-v2 is.
+# experimental as long as format.use-dirstate-v2 is.
 coreconfigitem(
     b'storage',
     b'dirstate-v2.slow-path',