--- a/tests/test-uncommit.t Thu Feb 14 15:17:54 2019 -0800
+++ b/tests/test-uncommit.t Fri Feb 15 10:39:45 2019 -0800
@@ -307,7 +307,7 @@
$ hg phase -r ".^"
12: public
-Uncommit leaving an empty changeset
+Uncommit with --keep or experimental.uncommit.keep leaves an empty changeset
$ cd $TESTTMP
$ hg init repo1
@@ -327,9 +327,31 @@
|/
o P FILES: P
+ $ cat >> .hg/hgrc <<EOF
+ > [experimental]
+ > uncommit.keep=True
+ > EOF
+ $ hg ci --amend
+ $ hg uncommit
+ note: keeping empty commit
+ $ hg log -G -T '{desc} FILES: {files}'
+ @ Q FILES:
+ |
+ | x Q FILES: Q
+ |/
+ o P FILES: P
+
$ hg status
A Q
-
+ $ hg ci --amend
+ $ hg uncommit --no-keep
+ $ hg log -G -T '{desc} FILES: {files}'
+ x Q FILES: Q
+ |
+ @ P FILES: P
+
+ $ hg status
+ A Q
$ cd ..
$ rm -rf repo1