D5420: py3: use '%d' for integers instead of '%s'
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Dec 14 16:13:25 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This should fix test-rebase-inmemory.t which started failing on Python 3 after
recent changes.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5420
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list