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

login
register
mail settings
Submitter phabricator
Date March 1, 2018, 9:35 a.m.
Message ID <2a679c9075be59391e655af445eb31d4@localhost.localdomain>
Download mbox | patch
Permalink /patch/28532/
State Not Applicable
Headers show

Comments

phabricator - March 1, 2018, 9:35 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd10f62d348a3: py3: use &#039;%d&#039; for integers instead of b&#039;%s&#039; (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2502?vs=6202&id=6234

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1036,7 +1036,7 @@ 
         return nullrev
     if len(parents) == 1:
         return parents.pop()
-    raise error.Abort(_('unable to collapse on top of %s, there is more '
+    raise error.Abort(_('unable to collapse on top of %d, there is more '
                        'than one external parent: %s') %
                      (max(destancestors),
                       ', '.join("%d" % p for p in sorted(parents))))