Mercurial > hg
changeset 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
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Fri, 14 Dec 2018 19:12:45 +0300 |
| parents | 205c639ce27d |
| children | ebc471ce9fad |
| files | mercurial/context.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Fri Dec 14 19:10:46 2018 +0300 +++ b/mercurial/context.py Fri Dec 14 19:12:45 2018 +0300 @@ -1870,11 +1870,11 @@ # files. if 'l' in self.p1()[component].flags(): raise error.Abort("error: %s conflicts with symlink %s " - "in %s." % (path, component, + "in %d." % (path, component, self.p1().rev())) else: raise error.Abort("error: '%s' conflicts with file '%s' in " - "%s." % (path, component, + "%d." % (path, component, self.p1().rev())) # Test that each new directory to be created to write this path from p2