Mercurial > hg

changeset 34304:ae510d9691ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: add a test for uncommit with uncommitondirtywdir config in merge Differential Revision: https://phab.mercurial-scm.org/D809
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 24 Sep 2017 19:37:55 +0530
parents 575097b4dce0
children 0e48813cc106
files tests/test-uncommit.t
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-uncommit.t	Thu Sep 14 13:14:32 2017 -0700
+++ b/tests/test-uncommit.t	Sun Sep 24 19:37:55 2017 +0530
@@ -354,6 +354,10 @@
   abort: outstanding uncommitted merge
   [255]
 
+  $ hg uncommit --config experimental.uncommitondirtywdir=True
+  abort: cannot uncommit while merging
+  [255]
+
   $ hg status
   M a
   $ hg commit -m 'merge a and b'