Mercurial > hg
diff mercurial/repair.py @ 33166:5c9ad50fd62f
config: register the 'devel.strip-obsmarkers' config
The single explicit default that existed so far is converted to registered
config value.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 28 Jun 2017 13:32:36 +0200 |
| parents | d09ae850296d |
| children | 665271d601f5 |
line wrap: on
line diff
--- a/mercurial/repair.py Wed Jun 28 13:32:28 2017 +0200 +++ b/mercurial/repair.py Wed Jun 28 13:32:36 2017 +0200 @@ -132,7 +132,7 @@ 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)