Patchwork D8931: tests: add test showing that merge state is not cleared by amend

login
register
mail settings
Submitter phabricator
Date Aug. 18, 2020, 10:38 p.m.
Message ID <differential-rev-PHID-DREV-4jdwk2ljngmzsrmektcj-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47030/
State Superseded
Headers show

Comments

phabricator - Aug. 18, 2020, 10:38 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is slightly modified version of the test case I provided in
  issue6304.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8931

AFFECTED FILES
  tests/test-amend.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -93,6 +93,30 @@ 
   nothing changed
   [1]
 
+#if obsstore-on
+  $ hg init repo-merge-state
+  $ cd repo-merge-state
+  $ echo a > f
+  $ hg ci -Aqm a
+  $ echo b > f
+  $ hg ci -Aqm b
+  $ echo c > f
+  $ hg co -m '.^'
+  merging f
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
+  $ echo d > f
+  $ hg resolve -m f
+  (no more unresolved files)
+  $ hg ci --amend --config experimental.evolution.allowunstable=True
+  1 new orphan changesets
+  $ hg resolve -l
+  R f
+  $ cd ..
+#endif
+
 Matcher and metadata options
 
   $ echo 3 > C