Show More
@@ -80,6 +80,9 b" coreconfigitem('devel', 'serverexactprot" | |||||
80 | coreconfigitem('devel', 'serverrequirecert', |
|
80 | coreconfigitem('devel', 'serverrequirecert', | |
81 | default=None, |
|
81 | default=None, | |
82 | ) |
|
82 | ) | |
|
83 | coreconfigitem('devel', 'strip-obsmarkers', | |||
|
84 | default=True, | |||
|
85 | ) | |||
83 | coreconfigitem('patch', 'fuzz', |
|
86 | coreconfigitem('patch', 'fuzz', | |
84 | default=2, |
|
87 | default=2, | |
85 | ) |
|
88 | ) |
@@ -132,7 +132,7 b' def strip(ui, repo, nodelist, backup=Tru' | |||||
132 | stripbases = [cl.node(r) for r in tostrip] |
|
132 | stripbases = [cl.node(r) for r in tostrip] | |
133 |
|
133 | |||
134 | stripobsidx = obsmarkers = () |
|
134 | stripobsidx = obsmarkers = () | |
135 |
if repo.ui.configbool('devel', 'strip-obsmarkers' |
|
135 | if repo.ui.configbool('devel', 'strip-obsmarkers'): | |
136 | obsmarkers = obsutil.exclusivemarkers(repo, stripbases) |
|
136 | obsmarkers = obsutil.exclusivemarkers(repo, stripbases) | |
137 | if obsmarkers: |
|
137 | if obsmarkers: | |
138 | stripobsidx = [i for i, m in enumerate(repo.obsstore) |
|
138 | stripobsidx = [i for i, m in enumerate(repo.obsstore) |
General Comments 0
You need to be logged in to leave comments.
Login now