equal
deleted
inserted
replaced
3496 |
3496 |
3497 # commit |
3497 # commit |
3498 node = repo.commit(text=message, user=user, |
3498 node = repo.commit(text=message, user=user, |
3499 date=date, extra=extra, editor=editor) |
3499 date=date, extra=extra, editor=editor) |
3500 if node is None: |
3500 if node is None: |
3501 ui.warn(_('note: graft of %s created no changes to commit\n') % |
3501 ui.warn( |
3502 desc) |
3502 _('note: graft of %d:%s created no changes to commit\n') % |
|
3503 (ctx.rev(), ctx)) |
3503 finally: |
3504 finally: |
3504 wlock.release() |
3505 wlock.release() |
3505 |
3506 |
3506 # remove state when we complete successfully |
3507 # remove state when we complete successfully |
3507 if not opts.get('dry_run'): |
3508 if not opts.get('dry_run'): |