--- a/mercurial/commands.py Fri Oct 23 20:33:36 2020 +0900
+++ b/mercurial/commands.py Wed Oct 28 17:41:25 2020 +0100
@@ -861,13 +861,11 @@
ui.status(
_(b'changeset %s backs out changeset %s\n')
- % (nice(repo.changelog.tip()), nice(node))
+ % (nice(newnode), nice(node))
)
if opts.get(b'merge') and op1 != node:
hg.clean(repo, op1, show_stats=False)
- ui.status(
- _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
- )
+ ui.status(_(b'merging with changeset %s\n') % nice(newnode))
overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
with ui.configoverride(overrides, b'backout'):
return hg.merge(repo[b'tip'])