# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1523907983 25200
# Node ID a6bac0492eff4c30ccd0810689f41f0d9bc15c03
# Parent  a346b1641dfa6f35f3f156bd233702847358369b# Parent  c912eaf29eecdb50613e91cf9d87fe99217e1392
branching: merge with stable

diff -r a346b1641dfa -r a6bac0492eff hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py	Mon Apr 16 20:18:10 2018 +0200
+++ b/hgext3rd/evolve/compat.py	Mon Apr 16 12:46:23 2018 -0700
@@ -55,14 +55,16 @@
 
 # Wrap obsolete.creatmarkers and make it accept but ignore "operation" argument
 # for hg < 4.3
-createmarkers = obsolete.createmarkers
-originalcreatemarkers = createmarkers
+originalcreatemarkers = obsolete.createmarkers
 while isinstance(originalcreatemarkers, functools.partial):
     originalcreatemarkers = originalcreatemarkers.func
 if originalcreatemarkers.__code__.co_argcount < 6:
     def createmarkers(repo, relations, flag=0, date=None, metadata=None,
                       operation=None):
         return obsolete.createmarkers(repo, relations, flag, date, metadata)
+else:
+    def createmarkers(*args, **kwargs):
+        return obsolete.createmarkers(*args, **kwargs)
 
 if not util.safehasattr(hg, '_copycache'):
     # exact copy of relevantmarkers as in Mercurial-176d1a0ce385
diff -r a346b1641dfa -r a6bac0492eff hgext3rd/topic/compat.py
--- a/hgext3rd/topic/compat.py	Mon Apr 16 20:18:10 2018 +0200
+++ b/hgext3rd/topic/compat.py	Mon Apr 16 12:46:23 2018 -0700
@@ -31,14 +31,16 @@
 
 # Wrap obsolete.creatmarkers and make it accept but ignore "operation" argument
 # for hg < 4.3
-createmarkers = obsolete.createmarkers
-originalcreatemarkers = createmarkers
+originalcreatemarkers = obsolete.createmarkers
 while isinstance(originalcreatemarkers, functools.partial):
     originalcreatemarkers = originalcreatemarkers.func
 if originalcreatemarkers.__code__.co_argcount < 6:
     def createmarkers(repo, relations, flag=0, date=None, metadata=None,
                       operation=None):
         return obsolete.createmarkers(repo, relations, flag, date, metadata)
+else:
+    def createmarkers(*args, **kwargs):
+        return obsolete.createmarkers(*args, **kwargs)
 
 def startpager(ui, cmd):
     """function to start a pager in case ui.pager() exists"""