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