834 commit(ui, repo, **commit_opts) |
834 commit(ui, repo, **commit_opts) |
835 def nice(node): |
835 def nice(node): |
836 return '%d:%s' % (repo.changelog.rev(node), short(node)) |
836 return '%d:%s' % (repo.changelog.rev(node), short(node)) |
837 ui.status(_('changeset %s backs out changeset %s\n') % |
837 ui.status(_('changeset %s backs out changeset %s\n') % |
838 (nice(repo.changelog.tip()), nice(node))) |
838 (nice(repo.changelog.tip()), nice(node))) |
839 if opts['merge'] and op1 != node: |
839 if op1 != node: |
840 ui.status(_('merging with changeset %s\n') % nice(op1)) |
840 if opts['merge']: |
841 doupdate(ui, repo, hex(op1), **opts) |
841 ui.status(_('merging with changeset %s\n') % nice(op1)) |
|
842 doupdate(ui, repo, hex(op1), **opts) |
|
843 else: |
|
844 ui.status(_('the backout changeset is a new head - ' |
|
845 'do not forget to merge\n')) |
|
846 ui.status(_('(use "backout -m" if you want to auto-merge)\n')) |
842 |
847 |
843 def bundle(ui, repo, fname, dest="default-push", **opts): |
848 def bundle(ui, repo, fname, dest="default-push", **opts): |
844 """create a changegroup file |
849 """create a changegroup file |
845 |
850 |
846 Generate a compressed changegroup file collecting all changesets |
851 Generate a compressed changegroup file collecting all changesets |