diff tests/test-commit-amend.t @ 35853:eeb87b24aea7 stable

amend: abort if unresolved merge conflicts found (issue5805)

It was checked by repo.commit() before e8a7c1a0565a "cmdutil: remove the
redundant commit during amend."

--- a/tests/test-commit-amend.t	Tue Mar 06 13:19:54 2018 -0600
+++ b/tests/test-commit-amend.t	Sun Mar 11 20:10:38 2018 +0900
@@ -415,6 +415,23 @@
   [255]
   $ hg ci -m 'merge'
 
+Refuse to amend if there is a merge conflict (issue5805):
+
+  $ hg up -q foo
+  $ echo c > a
+  $ hg up default -t :fail
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
+  $ hg resolve -l
+  U a
+
+  $ hg ci --amend
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
+
+  $ hg up -qC .
+
 Follow copies/renames:
 
   $ hg mv b c