Page MenuHomePhabricator

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

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

Details

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
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Tue, Nov 17, 1:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.