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

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2018, 4:40 p.m.
Message ID <ca704e344a6fac4d8237f592eddf1b62@localhost.localdomain>
Download mbox | patch
Permalink /patch/37146/
State Not Applicable
Headers show

Comments

phabricator - Dec. 14, 2018, 4:40 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4acba5621a63: py3: use &#039;%d&#039; for integers instead of &#039;%s&#039; (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5420?vs=12840&id=12845

REVISION DETAIL
  https://phab.mercurial-scm.org/D5420

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

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