changeset 33149 | d09ae850296d |
parent 33120 | 208de1534ebd |
child 33172 | 5c9ad50fd62f |
--- a/mercurial/repair.py Tue Jun 27 01:03:01 2017 +0200 +++ b/mercurial/repair.py Tue Jun 27 01:11:56 2017 +0200 @@ -20,6 +20,7 @@ error, exchange, obsolete, + obsutil, util, ) @@ -132,7 +133,7 @@ stripobsidx = obsmarkers = () if repo.ui.configbool('devel', 'strip-obsmarkers', True): - obsmarkers = obsolete.exclusivemarkers(repo, stripbases) + obsmarkers = obsutil.exclusivemarkers(repo, stripbases) if obsmarkers: stripobsidx = [i for i, m in enumerate(repo.obsstore) if m in obsmarkers]