Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 45759:e0ad11ab8052 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: don't assume that tip as what we just committed Differential Revision: https://phab.mercurial-scm.org/D9256
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Wed, 28 Oct 2020 17:41:25 +0100
parents 94f681b84c70
children b308d750de82 330c258fe7ca
line wrap: on
line diff
--- 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'])