diff -r 2e017696181f -r 0b7733719d21 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Wed Nov 13 21:52:25 2019 -0500
+++ b/mercurial/scmutil.py	Thu Nov 14 08:03:26 2019 -0800
@@ -964,7 +964,7 @@
         ui.note(_(b'creating directory: %s\n') % origvfs.join(origbackupdir))
 
         # Remove any files that conflict with the backup file's path
-        for f in reversed(list(util.finddirs(filepath))):
+        for f in reversed(list(pathutil.finddirs(filepath))):
             if origvfs.isfileorlink(f):
                 ui.note(_(b'removing conflicting file: %s\n') % origvfs.join(f))
                 origvfs.unlink(f)