--- a/mercurial/context.py	Wed Nov 13 21:52:25 2019 -0500
+++ b/mercurial/context.py	Thu Nov 14 08:03:26 2019 -0800
@@ -2080,7 +2080,7 @@
             # warned and backed up
             if wvfs.isdir(f) and not wvfs.islink(f):
                 wvfs.rmtree(f, forcibly=True)
-            for p in reversed(list(util.finddirs(f))):
+            for p in reversed(list(pathutil.finddirs(f))):
                 if wvfs.isfileorlink(p):
                     wvfs.unlink(p)
                     break