Patchwork D8194: tests: add test of committing with conflicts but no changes in wdir

login
register
mail settings
Submitter phabricator
Date March 2, 2020, 2:31 p.m.
Message ID <680f451ff84d6e5309fde4f22fe76076@localhost.localdomain>
Download mbox | patch
Permalink /patch/45417/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2020, 2:31 p.m.
Closed by commit rHG6cf92d6c0ad5: tests: add test of committing with conflicts but no changes in wdir (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8194?vs=20400&id=20411

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8194/new/

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

AFFECTED FILES
  tests/test-update-branches.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -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