comparison mercurial/context.py @ 40944:789515904b03

py3: use '%d' for integers instead of '%s'

This should fix test-rebase-inmemory.t which started failing on Python 3 after
recent changes.

Differential Revision: https://phab.mercurial-scm.org/D5420

40943:205c639ce27d

        def fail(path, component):
            # p1() is the base and we're receiving "writes" for p2()'s
            # files.
            if 'l' in self.p1()[component].flags():
                raise error.Abort("error: %s conflicts with symlink %s "
                                  "in %s." % (path, component,
                                              self.p1().rev()))
            else:
                raise error.Abort("error: '%s' conflicts with file '%s' in "
                                  "%s." % (path, component,
                                           self.p1().rev()))

        # Test that each new directory to be created to write this path from p2
        # is not a file in p1.
        components = path.split('/')

40944:789515904b03

        def fail(path, component):
            # p1() is the base and we're receiving "writes" for p2()'s
            # files.
            if 'l' in self.p1()[component].flags():
                raise error.Abort("error: %s conflicts with symlink %s "
                                  "in %d." % (path, component,
                                              self.p1().rev()))
            else:
                raise error.Abort("error: '%s' conflicts with file '%s' in "
                                  "%d." % (path, component,
                                           self.p1().rev()))

        # Test that each new directory to be created to write this path from p2
        # is not a file in p1.
        components = path.split('/')