diff -r 8788981c95f8 -r cc3452d2dfa4 mercurial/configitems.py --- a/mercurial/configitems.py Thu Jan 14 21:34:12 2021 +0530 +++ b/mercurial/configitems.py Mon Jan 18 21:37:20 2021 +0530 @@ -1098,21 +1098,6 @@ ) coreconfigitem( b'experimental', - b'sharesafe-auto-downgrade-shares', - default=False, -) -coreconfigitem( - b'experimental', - b'sharesafe-auto-upgrade-shares', - default=False, -) -coreconfigitem( - b'experimental', - b'sharesafe-auto-upgrade-fail-error', - default=False, -) -coreconfigitem( - b'experimental', b'sharesafe-warn-outdated-shares', default=True, ) @@ -1926,6 +1911,16 @@ default=b'identity', ) coreconfigitem( + b'share', + b'safe-mismatch.source-not-safe', + default=b'abort', +) +coreconfigitem( + b'share', + b'safe-mismatch.source-safe', + default=b'abort', +) +coreconfigitem( b'shelve', b'maxbackups', default=10,