Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use "%d" for converting int to bytes in transplant.py
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 14 Feb 2018 17:40:51 +0530
changeset 36226 4e33aa8639d0
parent 36225 a9d1ac7b91a8
child 36227 2f309b8846cf
py3: use "%d" for converting int to bytes in transplant.py Differential Revision: https://phab.mercurial-scm.org/D2266
hgext/transplant.py file | annotate | diff | comparison | revisions 
--- a/hgext/transplant.py	Wed Feb 14 17:39:56 2018 +0530
+++ b/hgext/transplant.py	Wed Feb 14 17:40:51 2018 +0530
@@ -161,7 +161,7 @@
             tr = repo.transaction('transplant')
             for rev in revs:
                 node = revmap[rev]
-                revstr = '%s:%s' % (rev, nodemod.short(node))
+                revstr = '%d:%s' % (rev, nodemod.short(node))
 
                 if self.applied(repo, node, p1):
                     self.ui.warn(_('skipping already applied revision %s\n') %
@@ -195,7 +195,7 @@
                 skipmerge = False
                 if parents[1] != revlog.nullid:
                     if not opts.get('parent'):
-                        self.ui.note(_('skipping merge changeset %s:%s\n')
+                        self.ui.note(_('skipping merge changeset %d:%s\n')
                                      % (rev, nodemod.short(node)))
                         skipmerge = True
                     else:
hg-stable