Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use '%d' for integers instead of '%s'
authorPulkit Goyal <pulkit@yandex-team.ru>
Fri, 14 Dec 2018 19:12:45 +0300
changeset 40944 789515904b03
parent 40943 205c639ce27d
child 40945 ebc471ce9fad
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
mercurial/context.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial