Show More
@@ -2150,7 +2150,7 b' def _dograft(ui, repo, *revs, **opts):' | |||||
2150 | skipped = set() |
|
2150 | skipped = set() | |
2151 | # check for merges |
|
2151 | # check for merges | |
2152 | for rev in repo.revs('%ld and merge()', revs): |
|
2152 | for rev in repo.revs('%ld and merge()', revs): | |
2153 |
ui.warn(_('skipping ungraftable merge revision % |
|
2153 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) | |
2154 | skipped.add(rev) |
|
2154 | skipped.add(rev) | |
2155 | revs = [r for r in revs if r not in skipped] |
|
2155 | revs = [r for r in revs if r not in skipped] | |
2156 | if not revs: |
|
2156 | if not revs: |
General Comments 0
You need to be logged in to leave comments.
Login now