# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1519834515 -19800 # Node ID a6e9a360ccd89d64514aa163bd94ec855989d998 # Parent 035b77bf01d27bc5d99849922f8f092baf9e34b1 py3: use '%d' for integers instead of b'%s' Differential Revision: https://phab.mercurial-scm.org/D2502 diff -r 035b77bf01d2 -r a6e9a360ccd8 hgext/rebase.py --- a/hgext/rebase.py Wed Feb 28 21:44:28 2018 +0530 +++ b/hgext/rebase.py Wed Feb 28 21:45:15 2018 +0530 @@ -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))))