mercurial/commands.py
branchstable
changeset 15357 8ec1a2cfd2c0
parent 15355 dbdb777502dc
child 15359 a5a8adf95e51
equal deleted inserted replaced
15356:6d6b1b9aeea6 15357:8ec1a2cfd2c0
  2558     if not revs:
  2558     if not revs:
  2559         return -1
  2559         return -1
  2560 
  2560 
  2561     for pos, ctx in enumerate(repo.set("%ld", revs)):
  2561     for pos, ctx in enumerate(repo.set("%ld", revs)):
  2562         current = repo['.']
  2562         current = repo['.']
  2563         ui.status('grafting revision %s', ctx.rev())
  2563         ui.status('grafting revision %s\n' % ctx.rev())
  2564 
  2564 
  2565         # we don't merge the first commit when continuing
  2565         # we don't merge the first commit when continuing
  2566         if not cont:
  2566         if not cont:
  2567             # perform the graft merge with p1(rev) as 'ancestor'
  2567             # perform the graft merge with p1(rev) as 'ancestor'
  2568             try:
  2568             try: