From patchwork Tue Nov 17 06:48:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D9334: tests: show that interactive shelve can leave the repo with a merge state From: phabricator X-Patchwork-Id: 47610 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Tue, 17 Nov 2020 06:48:59 +0000 martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION 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). REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9334 AFFECTED FILES tests/test-shelve.t CHANGE DETAILS To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -810,6 +810,9 @@ ? foo/foo $ hg bookmark \* test (4|13):33f7f61e6c5e (re) +BROKEN: there shouldn't be a merge state + $ hg resolve -l + R a/a $ hg unshelve unshelving change 'test' temporarily committing pending changes (restore with 'hg unshelve --abort')