Mercurial > hg

diff tests/test-uncommit.t @ 34284:624c53e4121d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: don't allow bare uncommit on dirty working directory As per IRC discussion and suggestion by Augie, we should not allow bare `hg uncommit` on dirty working directory. Differential Revision: https://phab.mercurial-scm.org/D734
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 20 Sep 2017 02:18:01 +0530
parents f94442d46984
children 7b1e524ad73f
line wrap: on
line diff
--- a/tests/test-uncommit.t	Sat Sep 16 02:34:13 2017 +0530
+++ b/tests/test-uncommit.t	Wed Sep 20 02:18:01 2017 +0530
@@ -149,6 +149,9 @@
   foo
   $ hg status
   M files
+  $ hg uncommit
+  abort: uncommitted changes
+  [255]
   $ hg uncommit files
   $ cat files
   abcde
@@ -337,7 +340,7 @@
   (branch merge, don't forget to commit)
 
   $ hg uncommit
-  abort: cannot uncommit while merging
+  abort: outstanding uncommitted merge
   [255]
 
   $ hg status