Mercurial > hg > evolve
changeset 3174:1e29cdd9c022
branching: merge with stable
Merge with the inhibit fix.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 19 Oct 2017 20:01:00 +0200 |
| parents | 87e349f617f9 (current diff) b76fe277cef2 (diff) |
| children | 039313d772d2 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/hack/inhibit.py +++ b/hgext3rd/evolve/hack/inhibit.py @@ -236,8 +236,11 @@ repo._obsoletenotrebased = r.keys() return r -def _clearrebased(orig, ui, repo, *args, **kwargs): - r = orig(ui, repo, *args, **kwargs) +def _clearrebased(orig, ui, repo, dest, state, skipped, collapsedas=None, + keepf=False): + r = orig(ui, repo, dest, state, skipped, collapsedas, keepf) + if keepf: + return r tonode = repo.changelog.node if util.safehasattr(repo, '_obsoletenotrebased'): _deinhibitmarkers(repo, [tonode(k) for k in repo._obsoletenotrebased])