##// END OF EJS Templates
print message after backout that tells that backout adds new head.
Vadim Gelfer -
r2493:9c660e69 default
parent child Browse files
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 opts['merge'] and op1 != node:
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
@@ -26,4 +26,6 b' adding a'
26 26 adding b
27 27 reverting a
28 28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
29 b
29 the backout changeset is a new head - do not forget to merge
30 (use "backout -m" if you want to auto-merge)
31 b: No such file or directory
General Comments 0
You need to be logged in to leave comments. Login now