Mercurial > hg-stable
changeset 45875:073bb7563931
shelve: clear merge state after partial shelve
Differential Revision: https://phab.mercurial-scm.org/D9335
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 16 Nov 2020 21:28:42 -0800 |
| parents | 781b09790633 |
| children | c9c3c277e5a5 |
| files | mercurial/shelve.py tests/test-shelve.t |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/shelve.py Mon Nov 16 22:38:36 2020 -0800 +++ b/mercurial/shelve.py Mon Nov 16 21:28:42 2020 -0800 @@ -564,6 +564,10 @@ scmutil.movedirstate(repo, parent, match) else: hg.update(repo, parent.node()) + ms = mergestatemod.mergestate.read(repo) + if not ms.unresolvedcount(): + ms.reset() + if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts): repo.dirstate.setbranch(origbranch)
--- a/tests/test-shelve.t Mon Nov 16 22:38:36 2020 -0800 +++ b/tests/test-shelve.t Mon Nov 16 21:28:42 2020 -0800 @@ -810,9 +810,8 @@ ? 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')