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

login
register
mail settings
Submitter phabricator
Date Nov. 17, 2020, 6:48 a.m.
Message ID <differential-rev-PHID-DREV-vfeehkwlb2dsba73olwp-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47610/
State Superseded
Headers show

Comments

phabricator - Nov. 17, 2020, 6:48 a.m.
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

Patch

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