Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use '%d' for integers instead of b'%s'
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 28 Feb 2018 21:45:15 +0530
changeset 36478 a6e9a360ccd8
parent 36477 035b77bf01d2
child 36479 3b98ffd2dde3
py3: use '%d' for integers instead of b'%s' Differential Revision: https://phab.mercurial-scm.org/D2502
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- 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))))
Mercurial