comparison mercurial/shelve.py @ 45860: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
comparison
equal deleted inserted replaced
45859:781b09790633 45860:073bb7563931
562 if opts[b'keep']: 562 if opts[b'keep']:
563 with repo.dirstate.parentchange(): 563 with repo.dirstate.parentchange():
564 scmutil.movedirstate(repo, parent, match) 564 scmutil.movedirstate(repo, parent, match)
565 else: 565 else:
566 hg.update(repo, parent.node()) 566 hg.update(repo, parent.node())
567 ms = mergestatemod.mergestate.read(repo)
568 if not ms.unresolvedcount():
569 ms.reset()
570
567 if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts): 571 if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
568 repo.dirstate.setbranch(origbranch) 572 repo.dirstate.setbranch(origbranch)
569 573
570 _finishshelve(repo, tr) 574 _finishshelve(repo, tr)
571 finally: 575 finally: