diff tests/test-evolve-abort-orphan.t @ 5637:eed42a183d46 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

# no-check-commit

--- a/tests/test-evolve-abort-orphan.t	Sat Oct 31 19:10:55 2020 +0800
+++ b/tests/test-evolve-abort-orphan.t	Sat Oct 31 19:33:42 2020 +0800
@@ -10,7 +10,6 @@
 Setup
 =====
 
-#testcases abortcommand abortflag
   $ cat >> $HGRCPATH <<EOF
   > [phases]
   > publish = False
@@ -20,12 +19,10 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
-#if abortflag
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > abort = evolve --abort
   > EOF
-#endif
 
   $ hg init abortrepo
   $ cd abortrepo
@@ -49,15 +46,9 @@
 Testing --abort when no evolve is interrupted
 =============================================
 
-#if abortflag
   $ hg evolve --abort
   abort: no interrupted evolve to abort
   [255]
-#else
-  $ hg abort
-  abort: no operation in progress
-  [255]
-#endif
 
 Testing with wrong combination of flags
 =======================================
@@ -111,11 +102,6 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added c
   
-#if abortcommand
-when in dry-run mode
-  $ hg abort --dry-run
-  evolve in progress, will be aborted
-#endif
 
   $ hg abort
   evolve aborted