This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9334

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

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG781b09790633: tests: show that interactive shelve can leave the repo with a merge state
Summary

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).

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: rHG781b09790633: tests: show that interactive shelve can leave the repo with a merge state.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG781b09790633: tests: show that interactive shelve can leave the repo with a merge state (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 23529

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
$ 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