Mercurial > evolve
changeset 6447:050d3f21ea30 stable
tests: adapt to quieter transaction rollback in simple case
CORE-TEST-OUTPUT-UPDATE: 27fd12eca557
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 07 Mar 2023 23:51:25 +0100 |
| parents | 88c701539ed4 |
| children | aad3e0c82031 |
| files | tests/test-evolve-interrupted.t |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-interrupted.t Tue Mar 07 19:56:32 2023 +0100 +++ b/tests/test-evolve-interrupted.t Tue Mar 07 23:51:25 2023 +0100 @@ -45,8 +45,8 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! - rollback completed + transaction abort! (no-hg64 !) + rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg l @@ -104,8 +104,8 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! - rollback completed + transaction abort! (no-hg64 !) + rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ cat b @@ -129,8 +129,8 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! - rollback completed + transaction abort! (no-hg64 !) + rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg evolve --continue