Commit 4e5f656a authored by Martin von Zweigbergk's avatar Martin von Zweigbergk

rebase: clear merge state when aborting in-memory merge on dirty working copy

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

--HG--
branch : stable
parent 39e2cf7cb120
Pipeline #13971 passed with stage
in 43 minutes and 42 seconds
......@@ -638,7 +638,12 @@ class rebaseruntime(object):
b"commit again in the working copy\n"
)
)
cmdutil.bailifchanged(repo)
try:
cmdutil.bailifchanged(repo)
except error.Abort:
clearstatus(repo)
clearcollapsemsg(repo)
raise
self.inmemory = False
self._assignworkingcopy()
mergemod.update(repo[p1], wc=self.wctx)
......
......@@ -489,12 +489,6 @@ Retrying without in-memory merge won't lose working copy changes
dirty
$ hg status -v
M a
# The repository is in an unfinished *rebase* state.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
# To stop: hg rebase --stop
Retrying without in-memory merge won't lose merge state
$ cd ..
......
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