Patchwork D809: uncommit: add a test for uncommit with uncommitondirtywdir config in merge

login
register
mail settings
Submitter phabricator
Date Sept. 25, 2017, 3:02 p.m.
Message ID <2c566e2a59d28643420de3b8ade404f0@localhost.localdomain>
Download mbox | patch
Permalink /patch/24139/
State Not Applicable
Headers show

Comments

phabricator - Sept. 25, 2017, 3:02 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGae510d9691ef: uncommit: add a test for uncommit with uncommitondirtywdir config in merge (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D809?vs=2059&id=2064

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

AFFECTED FILES
  tests/test-uncommit.t

CHANGE DETAILS




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

Patch

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