This instance will be upgraded to Heptapod 0.21.0rc3 on 2021-04-23 at 10:30 UTC+2 (a few minutes of down time)

Commit 62b3927b authored by Martin von Zweigbergk's avatar Martin von Zweigbergk

shelve: clear merge state after partial shelve

Differential Revision:
parent 781b09790633
......@@ -564,6 +564,10 @@ def _docreatecmd(ui, repo, pats, opts):
scmutil.movedirstate(repo, parent, match)
hg.update(repo, parent.node())
ms =
if not ms.unresolvedcount():
if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
......@@ -810,9 +810,8 @@ Test interactive shelve
? foo/foo
$ hg bookmark
\* test (4|13):33f7f61e6c5e (re)
BROKEN: there shouldn't be a merge state
there shouldn't be a merge state
$ hg resolve -l
R a/a
$ hg unshelve
unshelving change 'test'
temporarily committing pending changes (restore with 'hg unshelve --abort')
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