This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4e33aa8639d0: py3: use "%d" for converting int to
bytes in transplant.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2266?vs=5706&id=5720
REVISION DETAIL
https://phab.mercurial-scm.org/D2266
AFFECTED FILES
hgext/transplant.py
CHANGE DETAILS
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -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:
To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel