Mercurial > public > mercurial-scm > hg-stable
diff mercurial/shelve.py @ 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 | 5c8230ca37f2 |
| children | 89a2afe31e82 |
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)