Commit c2d94285 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

backout: don't assume that tip as what we just committed

Differential Revision: https://phab.mercurial-scm.org/D9256

--HG--
branch : stable
parent ff48eea4a926
......@@ -861,13 +861,11 @@ def _dobackout(ui, repo, node=None, rev=None, **opts):
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'])
......
......@@ -806,3 +806,18 @@ Test usage of `hg resolve` in case of conflict
$ hg backout --merge --no-commit 2
abort: cannot specify both --no-commit and --merge
[255]
Ensure that backout out the same changeset twice performs correctly:
$ hg backout 2
removing 3
changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f
$ echo 4 > 4
$ hg ci -A -m 4
adding 4
$ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg backout 2
removing 3
created new head
changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment