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 dbcb6389 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk

tests: show that interactive shelve can leave the repo with a merge state

If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).

Differential Revision: https://phab.mercurial-scm.org/D9334
parent 62983988bbf5
......@@ -810,6 +810,9 @@ Test interactive shelve
? foo/foo
$ hg bookmark
\* test (4|13):33f7f61e6c5e (re)
BROKEN: 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