equal
deleted
inserted
replaced
2148 revs = scmutil.revrange(repo, revs) |
2148 revs = scmutil.revrange(repo, revs) |
2149 |
2149 |
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 %s\n') % rev) |
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: |
2157 return -1 |
2157 return -1 |
2158 |
2158 |