# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2017-06-28 11:32:36
# Node ID 5c9ad50fd62fbc2057ef7b44f921f22e7359af32
# Parent  1a6f2843913544f69a9647c69ee89922747e268c

config: register the 'devel.strip-obsmarkers' config

The single explicit default that existed so far is converted to registered
config value.

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -80,6 +80,9 @@ coreconfigitem('devel', 'serverexactprot
 coreconfigitem('devel', 'serverrequirecert',
     default=None,
 )
+coreconfigitem('devel', 'strip-obsmarkers',
+    default=True,
+)
 coreconfigitem('patch', 'fuzz',
     default=2,
 )
diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -132,7 +132,7 @@ def strip(ui, repo, nodelist, backup=Tru
     stripbases = [cl.node(r) for r in tostrip]
 
     stripobsidx = obsmarkers = ()
-    if repo.ui.configbool('devel', 'strip-obsmarkers', True):
+    if repo.ui.configbool('devel', 'strip-obsmarkers'):
         obsmarkers = obsutil.exclusivemarkers(repo, stripbases)
     if obsmarkers:
         stripobsidx = [i for i, m in enumerate(repo.obsstore)