equal
deleted
inserted
replaced
2522 '(%d:%s also has origin %d:%s)\n') |
2522 '(%d:%s also has origin %d:%s)\n') |
2523 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
2523 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
2524 revs.remove(ids[n]) |
2524 revs.remove(ids[n]) |
2525 elif ctx.hex() in ids: |
2525 elif ctx.hex() in ids: |
2526 r = ids[ctx.hex()] |
2526 r = ids[ctx.hex()] |
2527 ui.warn(_('skipping already grafted revision %d:%s ' |
2527 if r in revs: |
2528 '(was grafted from %d:%s)\n') % |
2528 ui.warn(_('skipping already grafted revision %d:%s ' |
2529 (r, repo[r], rev, ctx)) |
2529 '(was grafted from %d:%s)\n') % |
2530 revs.remove(r) |
2530 (r, repo[r], rev, ctx)) |
|
2531 revs.remove(r) |
2531 if not revs: |
2532 if not revs: |
2532 return -1 |
2533 return -1 |
2533 |
2534 |
2534 if opts.get('no_commit'): |
2535 if opts.get('no_commit'): |
2535 statedata['no_commit'] = True |
2536 statedata['no_commit'] = True |