D809: uncommit: add a test for uncommit with uncommitondirtywdir config in merge
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sun Sep 24 14:08:33 UTC 2017
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D809
AFFECTED FILES
tests/test-uncommit.t
CHANGE DETAILS
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'
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list