diff -r 7eba8f83129b -r e7aa113b14f7 mercurial/context.py
--- a/mercurial/context.py	Wed Aug 01 12:57:15 2018 -0700
+++ b/mercurial/context.py	Wed Aug 01 13:00:45 2018 -0700
@@ -1896,7 +1896,7 @@
         # Test that each new directory to be created to write this path from p2
         # is not a file in p1.
         components = path.split('/')
-        for i in xrange(len(components)):
+        for i in pycompat.xrange(len(components)):
             component = "/".join(components[0:i])
             if component in self.p1():
                 fail(path, component)