This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9335

shelve: clear merge state after partial shelve
ClosedPublic

Authored by martinvonz on Nov 17 2020, 1:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG073bb7563931: shelve: clear merge state after partial shelve

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 17 2020, 1:48 AM
martinvonz added a commit: rHG073bb7563931: shelve: clear merge state after partial shelve.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG073bb7563931: shelve: clear merge state after partial shelve (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (4 lines)
Mtests/test-shelve.t (3 lines)

Diff 23530

mercurial/shelve.py

_shelvecreatedcommit(repo, node, name, match) _shelvecreatedcommit(repo, node, name, match)
ui.status(_(b'shelved as %s\n') % name) ui.status(_(b'shelved as %s\n') % name)
if opts[b'keep']: if opts[b'keep']:
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
scmutil.movedirstate(repo, parent, match) scmutil.movedirstate(repo, parent, match)
else: else:
hg.update(repo, parent.node()) 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): if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
repo.dirstate.setbranch(origbranch) repo.dirstate.setbranch(origbranch)
_finishshelve(repo, tr) _finishshelve(repo, tr)
finally: finally:
_restoreactivebookmark(repo, activebookmark) _restoreactivebookmark(repo, activebookmark)
lockmod.release(tr, lock) lockmod.release(tr, lock)

tests/test-shelve.t

$ cat foo/foo $ cat foo/foo
foo foo
a a
$ hg st $ hg st
M a/a M a/a
? foo/foo ? foo/foo
$ hg bookmark $ hg bookmark
\* test (4|13):33f7f61e6c5e (re) \* test (4|13):33f7f61e6c5e (re)
BROKEN: there shouldn't be a merge state there shouldn't be a merge state
$ hg resolve -l $ hg resolve -l
R a/a
$ hg unshelve $ hg unshelve
unshelving change 'test' unshelving change 'test'
temporarily committing pending changes (restore with 'hg unshelve --abort') temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes rebasing shelved changes
merging a/a merging a/a
$ hg bookmark $ hg bookmark
\* test (4|13):33f7f61e6c5e (re) \* test (4|13):33f7f61e6c5e (re)
$ cat a/a $ cat a/a