changeset 41888:6a944bf4c43a

tests: clarify test setup test in test-uncommit.t I assume the "hg uncommit b" is there to prove that the working copy is dirty before we try "hg uncommit --allow-dirty-working-copy b". It seems clearer to put that check just before we run the actual test. Differential Revision: https://phab.mercurial-scm.org/D6078
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 06 Mar 2019 15:43:52 -0800
parents 8c6ba2909155
children 3ba9ca537f57
files tests/test-uncommit.t
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-uncommit.t	Wed Mar 06 15:35:40 2019 -0800
+++ b/tests/test-uncommit.t	Wed Mar 06 15:43:52 2019 -0800
@@ -482,10 +482,6 @@
   A b
   $ hg unc a
   note: keeping empty commit
-  $ hg unc b
-  abort: uncommitted changes
-  (requires --allow-dirty-working-copy to uncommit)
-  [255]
   $ cat a
   super critical info!
   $ hg log
@@ -498,6 +494,10 @@
   
   $ hg ci -Am 'add b'
   $ echo 'foo bar' > b
+  $ hg unc b
+  abort: uncommitted changes
+  (requires --allow-dirty-working-copy to uncommit)
+  [255]
   $ hg unc --allow-dirty-working-copy b
   $ hg log
   changeset:   3:30fa958635b2