# HG changeset patch
# User Pulkit Goyal <pulkit@yandex-team.ru>
# Date 2018-12-14 16:12:45
# Node ID 789515904b0366ddb380270a40eff2fdb3aa07aa
# Parent  205c639ce27de3b965a09a42ea994fbfb72519d0

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

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1870,11 +1870,11 @@ class overlayworkingctx(committablectx):
             # 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