Mercurial > evolve
diff tests/test-evolve-interrupted.t @ 6802:681b100496ff mercurial-6.3
test-compat: merge mercurial-6.4 into mercurial-6.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 15:02:19 +0400 |
| parents | 050d3f21ea30 |
| children | c7d3e1d8c6f1 |
line wrap: on
line diff
--- a/tests/test-evolve-interrupted.t Wed Jun 26 15:02:14 2024 +0400 +++ b/tests/test-evolve-interrupted.t Wed Jun 26 15:02:19 2024 +0400 @@ -45,6 +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 abort: precommit hook exited with status 1 [40] $ hg l @@ -102,6 +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 abort: precommit hook exited with status 1 [40] $ cat b @@ -125,6 +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 abort: precommit hook exited with status 1 [40] $ hg evolve --continue