Mercurial > evolve
changeset 6903:de8156fbbdcc mercurial-6.3
test-compat: merge mercurial-6.4 into mercurial-6.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 24 Oct 2024 17:57:18 +0400 |
| parents | 681b100496ff (diff) e41e12c576ed (current diff) |
| children | b77363ea9d63 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-interrupted.t Thu Oct 24 17:57:16 2024 +0400 +++ b/tests/test-evolve-interrupted.t Thu Oct 24 17:57:18 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