Mercurial > evolve
changeset 6491:173293415d1f
tests: capture .hg/merge/state presence as well
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 25 May 2023 11:08:09 -0300 |
| parents | 24f1f34b4a5e |
| children | e44d343b9ed2 |
| files | tests/test-evolve-abort-orphan.t tests/test-evolve-stop-orphan.t |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t Wed May 24 23:56:46 2023 +0200 +++ b/tests/test-evolve-abort-orphan.t Thu May 25 11:08:09 2023 -0300 @@ -580,15 +580,16 @@ (see 'hg help evolve.interrupted') [240] -We do have a state file before abort +We do have state files for evolve and merge before abort - $ ls .hg/ | grep evolvestate - evolvestate + $ find .hg/ -name '*state' | grep -v dirstate | sort + .hg/evolvestate + .hg/merge/state -The file is gone after abort +The files are gone after abort $ hg abort evolve aborted working directory is now at c1f4718020e3 - $ ls .hg/ | grep evolvestate + $ find .hg/ -name '*state' | grep -v dirstate [1]
--- 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