Mercurial > hg > evolve
changeset 7133:fc0b5158fd2f mercurial-6.9
tests: remove some "(hgXY !)" markers for the new compatibility branch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 09 Mar 2025 18:47:15 +0400 |
| parents | 6d69ac73cf49 |
| children | dc1efbb02511 |
| files | tests/test-evolve-interrupted.t tests/test-topic-flow-publish-flag.t |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-interrupted.t +++ b/tests/test-evolve-interrupted.t @@ -45,8 +45,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg l @@ -104,8 +102,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ cat b @@ -129,8 +125,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg evolve --continue
--- a/tests/test-topic-flow-publish-flag.t +++ b/tests/test-topic-flow-publish-flag.t @@ -439,12 +439,12 @@ $ cd $TESTTMP/bare-client/.hg/cache/ $ grep double branch2* | sort - branch2-base:* o double//slash (glob) (hg68 !) + branch2-base:* o double//slash (glob) branch2-immutable:* o double//slash (glob) - branch2-served:* o double//slash (glob) (hg68 !) + branch2-served:* o double//slash (glob) $ cd $TESTTMP/bare-branch-server/.hg/cache/ $ grep double branch2* | sort branch2-base:* o double//slash (glob) branch2-immutable:* o double//slash (glob) - branch2-served:* o double//slash (glob) (hg68 !) + branch2-served:* o double//slash (glob)