--- a/hgext/evolve.py	Mon Aug 01 22:55:11 2016 +0200
+++ b/hgext/evolve.py	Mon Aug 08 10:05:47 2016 -0700
@@ -1024,7 +1024,7 @@
 ### dirstate compatibility layer < hg 3.6
 
 def writedirstate(dirstate, tr):
-    if dirstate.write.func_defaults is not None: # mercurial 3.6 and above
+    if dirstate.write.func_code.co_argcount != 1: # mercurial 3.6 and above
         return dirstate.write(tr)
     return dirstate.write()