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