Mercurial > evolve

diff tests/test-evolve-stop-orphan.t @ 6504:db0fd1f1a7d0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: capture .hg/merge/state presence as well
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 25 May 2023 11:08:09 -0300
parents f6d12afe8322
children 019da9cc0ac5
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t	Wed May 24 23:56:46 2023 +0200
+++ b/tests/test-evolve-stop-orphan.t	Thu May 25 11:08:09 2023 -0300
@@ -163,9 +163,10 @@
   +foo
   +>>>>>>> evolving:    c41c793e0ef1 - test: added d
 
-we do have a evolvestate file before the --stop
-  $ ls .hg/ | grep evolvestate
-  evolvestate
+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
@@ -186,9 +187,8 @@
 
   $ hg status
 
-The state file is gone after the --stop
-
-  $ ls .hg/ | grep evolvestate
+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