Show More
@@ -836,9 +836,14 b' def backout(ui, repo, rev, **opts):' | |||
|
836 | 836 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
837 | 837 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
838 | 838 | (nice(repo.changelog.tip()), nice(node))) |
|
839 |
if |
|
|
840 | ui.status(_('merging with changeset %s\n') % nice(op1)) | |
|
841 | doupdate(ui, repo, hex(op1), **opts) | |
|
839 | if op1 != node: | |
|
840 | if opts['merge']: | |
|
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 | 848 | def bundle(ui, repo, fname, dest="default-push", **opts): |
|
844 | 849 | """create a changegroup file |
General Comments 0
You need to be logged in to leave comments.
Login now