changeset 6490:24f1f34b4a5e

tests: narrow some listing of .hg down Having that wide listing it a source of trouble, lets check for what we are checking.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 24 May 2023 23:56:46 +0200
parents 71a8d4db4f55
children 173293415d1f
files tests/test-evolve-abort-orphan.t tests/test-evolve-stop-orphan.t
diffstat 2 files changed, 18 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t	Tue May 23 11:09:06 2023 -0300
+++ b/tests/test-evolve-abort-orphan.t	Wed May 24 23:56:46 2023 +0200
@@ -580,24 +580,15 @@
   (see 'hg help evolve.interrupted')
   [240]
 
+We do have a state file before abort
+
+  $ ls .hg/ | grep evolvestate
+  evolvestate
+
+The file is gone after abort
+
   $ hg abort
   evolve aborted
   working directory is now at c1f4718020e3
-
-  $ ls .hg/
-  00changelog.i
-  bookmarks
-  branch
-  cache
-  dirstate
-  last-message.txt
-  requires
-  store
-  undo.backup.bookmarks (no-hg64 !)
-  undo.backup.branch* (glob) (hg64 !)
-  undo.backup.dirstate* (glob)
-  undo.bookmarks (no-hg64 !)
-  undo.branch (no-hg64 !)
-  undo.desc
-  undo.dirstate (no-hg64 !)
-  wcache
+  $ ls .hg/ | grep evolvestate
+  [1]
--- a/tests/test-evolve-stop-orphan.t	Tue May 23 11:09:06 2023 -0300
+++ b/tests/test-evolve-stop-orphan.t	Wed May 24 23:56:46 2023 +0200
@@ -163,6 +163,10 @@
   +foo
   +>>>>>>> evolving:    c41c793e0ef1 - test: added d
 
+we do have a evolvestate file before the --stop
+  $ ls .hg/ | grep evolvestate
+  evolvestate
+
   $ hg evolve --stop
   stopped the interrupted evolve
 
@@ -181,21 +185,11 @@
       () draft
 
   $ hg status
-  $ ls .hg/
-  00changelog.i
-  branch
-  cache
-  dirstate
-  last-message.txt
-  requires
-  store
-  undo.backup.branch* (glob) (hg64 !)
-  undo.backup.dirstate* (glob)
-  undo.bookmarks (no-hg64 !)
-  undo.branch (no-hg64 !)
-  undo.desc
-  undo.dirstate (no-hg64 !)
-  wcache
+
+The state file is gone after the --stop
+
+  $ ls .hg/ | grep evolvestate
+  [1]
 
 Checking when multiple revs need to be evolved, some revs evolve without
 conflicts