changeset 44435:6cf92d6c0ad5

tests: add test of committing with conflicts but no changes in wdir I'm about to change the behavior slightly here, so let's have a test that shows that. Differential Revision: https://phab.mercurial-scm.org/D8194
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Feb 2020 10:49:13 -0800
parents f6798c1a80fa
children f935b680860d
files tests/test-update-branches.t
diffstat 1 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-update-branches.t	Fri Feb 28 00:17:26 2020 +0100
+++ b/tests/test-update-branches.t	Fri Feb 28 10:49:13 2020 -0800
@@ -343,6 +343,22 @@
   $ hg resolve -l
   U a
 
+Try to make empty commit while there are conflicts
+  $ hg revert -r . a
+  $ rm a.orig
+  $ hg ci -m empty
+  nothing changed
+  [1]
+  $ hg resolve -m a
+  (no more unresolved files)
+  $ hg resolve -l
+  R a
+  $ hg ci -m empty
+  nothing changed
+  [1]
+  $ hg resolve -l
+  R a
+
 Change/delete conflict is not allowed
   $ hg up -qC 3
   $ hg rm foo