Show More
@@ -161,7 +161,7 b' class transplanter(object):' | |||
|
161 | 161 | tr = repo.transaction('transplant') |
|
162 | 162 | for rev in revs: |
|
163 | 163 | node = revmap[rev] |
|
164 |
revstr = '% |
|
|
164 | revstr = '%d:%s' % (rev, nodemod.short(node)) | |
|
165 | 165 | |
|
166 | 166 | if self.applied(repo, node, p1): |
|
167 | 167 | self.ui.warn(_('skipping already applied revision %s\n') % |
@@ -195,7 +195,7 b' class transplanter(object):' | |||
|
195 | 195 | skipmerge = False |
|
196 | 196 | if parents[1] != revlog.nullid: |
|
197 | 197 | if not opts.get('parent'): |
|
198 |
self.ui.note(_('skipping merge changeset % |
|
|
198 | self.ui.note(_('skipping merge changeset %d:%s\n') | |
|
199 | 199 | % (rev, nodemod.short(node))) |
|
200 | 200 | skipmerge = True |
|
201 | 201 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now