# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508436060 -7200
# Node ID 1e29cdd9c02281f882b658f029843c5746a99ac6
# Parent  87e349f617f95a04249cd0cb7ebe948270b7a193# Parent  b76fe277cef2b75191acc0f348e7653346a193c2
branching: merge with stable

Merge with the inhibit fix.

diff -r 87e349f617f9 -r 1e29cdd9c022 hgext3rd/evolve/hack/inhibit.py
--- a/hgext3rd/evolve/hack/inhibit.py	Wed Oct 18 19:00:56 2017 +0200
+++ b/hgext3rd/evolve/hack/inhibit.py	Thu Oct 19 20:01:00 2017 +0200
@@ -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])