mercurial/context.py

39168:02e80e37fbbc

        # 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 pycompat.xrange(len(components)):
            component = "/".join(components[0:i])
            if component in self.p1():
                fail(path, component)

        # Test the other direction -- that this path from p2 isn't a directory
        # in p1 (test that p1 doesn't any paths matching `path/*`).
        match = matchmod.match('/', '', [path + '/'], default=b'relpath')

39169:873f3a56993f

        # 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 pycompat.xrange(len(components)):
            component = "/".join(components[0:i])
            if component in self.p1() and self._cache[component]['exists']:
                fail(path, component)

        # Test the other direction -- that this path from p2 isn't a directory
        # in p1 (test that p1 doesn't any paths matching `path/*`).
        match = matchmod.match('/', '', [path + '/'], default=b'relpath')