--- a/hgext3rd/evolve/__init__.py	Thu Mar 09 10:42:50 2017 -0800
+++ b/hgext3rd/evolve/__init__.py	Thu Mar 09 13:11:20 2017 -0800
@@ -1507,7 +1507,7 @@
                 _evolvestatedelete(repo)
                 return ret
             finally:
-                util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
+                util.unlinkpath(repo.vfs.join('graftstate'), ignoremissing=True)
         finally:
             lock.release()
     cmdutil.bailifchanged(repo)
@@ -3181,7 +3181,7 @@
 @eh.wrapfunction(hg, 'clean')
 def clean(orig, repo, *args, **kwargs):
     ret = orig(repo, *args, **kwargs)
-    util.unlinkpath(repo.join('evolvestate'), ignoremissing=True)
+    util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True)
     return ret
 
 def _evolvestatewrite(repo, state):
@@ -3246,7 +3246,7 @@
         f.close()
 
 def _evolvestatedelete(repo):
-    util.unlinkpath(repo.join('evolvestate'), ignoremissing=True)
+    util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True)
 
 def _evolvemerge(repo, orig, dest, pctx, keepbranch):
     """Used by the evolve function to merge dest on top of pctx.