diff tests/test-evolve-stop-orphan.t @ 6521:2226c9873533 mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 04 Jul 2023 15:56:55 -0300
parents 5f77d112be57 358bdf940e56
children
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t	Thu Mar 23 10:23:36 2023 -0300
+++ b/tests/test-evolve-stop-orphan.t	Tue Jul 04 15:56:55 2023 -0300
@@ -151,6 +151,11 @@
   +foo
   +>>>>>>> evolving:    c41c793e0ef1 - test: added d
 
+We do have state files for evolve and merge before the --stop
+  $ find .hg/ -name '*state' | grep -v dirstate | sort
+  .hg/evolvestate
+  .hg/merge/state
+
   $ hg evolve --stop
   stopped the interrupted evolve
 
@@ -169,19 +174,10 @@
       () draft
 
   $ hg status
-  $ ls .hg/
-  00changelog.i
-  branch
-  cache
-  dirstate
-  last-message.txt
-  requires
-  store
-  undo.backup.dirstate
-  undo.bookmarks
-  undo.branch
-  undo.desc
-  undo.dirstate
+
+The state files are gone after the --stop
+  $ find .hg/ -name '*state' | grep -v dirstate
+  [1]
 
 Checking when multiple revs need to be evolved, some revs evolve without
 conflicts