# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-08-18 21:26:49
# Node ID cf21cda4281f984f99be113956bdf1e2a74382df
# Parent  034d94f8761bc2cef964e94ed109fb5254788099

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

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

Differential Revision: https://phab.mercurial-scm.org/D8931

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