Mercurial > evolve

changeset 5709:d0f73113fcc0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove trailing "!" from abort messages CORE-TEST-OUTPUT-UPDATE: 95c4cca641f6 CORE-TEST-OUTPUT-UPDATE: 50afeeeb7b79 CORE-TEST-OUTPUT-UPDATE: 122f0b59f5f0 CORE-TEST-OUTPUT-UPDATE: ca39c45014fa
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 02 Dec 2020 09:40:33 +0800
parents fdc540a9b94b
children f65b2a978a1e
files tests/test-evolve-obshistory-amend-then-fold.t tests/test-evolve-obshistory-amend.t tests/test-evolve-obshistory-content-divergent.t tests/test-evolve-obshistory-fold.t tests/test-evolve-obshistory-lots-of-splits.t tests/test-evolve-obshistory-prune.t tests/test-evolve-obshistory-split.t tests/test-exchange-obsmarkers-case-A3.t tests/test-fold.t tests/test-minitopic.t tests/test-obsolete.t tests/test-prune.t tests/test-push-checkheads-mixed-branch-topic-G3.t tests/test-push-checkheads-multi-topics-F3.t tests/test-push-checkheads-multibranches-E3.t tests/test-push-checkheads-partial-C1.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C3.t tests/test-push-checkheads-partial-C4.t tests/test-push-checkheads-unpushed-D1.t tests/test-push-checkheads-unpushed-D2.t tests/test-push-checkheads-unpushed-D3.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-push-checkheads-unpushed-D6.t tests/test-sharing.t tests/test-topic-flow-publish-flag.t tests/test-topic-push.t tests/test-topic-tutorial.t tests/test-topic.t tests/test-userguide.t
diffstat 31 files changed, 50 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Wed Dec 02 09:40:33 2020 +0800
@@ -352,7 +352,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
--- a/tests/test-evolve-obshistory-amend.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-amend.t	Wed Dec 02 09:40:33 2020 +0800
@@ -203,7 +203,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
+  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden "desc(A0)"
--- a/tests/test-evolve-obshistory-content-divergent.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-content-divergent.t	Wed Dec 02 09:40:33 2020 +0800
@@ -439,7 +439,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' has diverged!
+  abort: hidden revision '471f378eab4c' has diverged
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
--- a/tests/test-evolve-obshistory-fold.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-fold.t	Wed Dec 02 09:40:33 2020 +0800
@@ -289,7 +289,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
@@ -299,7 +299,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
+  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Wed Dec 02 09:40:33 2020 +0800
@@ -444,7 +444,7 @@
   x  de7290d8b885 (1) A0
   
   $ hg update de7290d8b885
-  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
+  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
--- a/tests/test-evolve-obshistory-prune.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-prune.t	Wed Dec 02 09:40:33 2020 +0800
@@ -105,7 +105,7 @@
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' is pruned!
+  abort: hidden revision '0dec01379d3b' is pruned
   (use --hidden to access hidden revisions)
   [255]
   $ hg up --hidden -r 'desc(B0)'
--- a/tests/test-evolve-obshistory-split.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-evolve-obshistory-split.t	Wed Dec 02 09:40:33 2020 +0800
@@ -256,7 +256,7 @@
   x  471597cad322 (1) A0
   
   $ hg update 471597cad322
-  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
+  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
--- a/tests/test-exchange-obsmarkers-case-A3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -229,7 +229,7 @@
   $ hg push -R main -r 'desc(A1)' pushdest
   pushing to pushdest
   searching for changes
-  abort: push creates new remote head e5ea8f9c7314!
+  abort: push creates new remote head e5ea8f9c7314
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ cd ..
--- a/tests/test-fold.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-fold.t	Wed Dec 02 09:40:33 2020 +0800
@@ -151,7 +151,7 @@
 (test inherited from test-evolve.t)
 
   $ hg fold --from 6 # want to run hg fold 6
-  abort: hidden revision '6' was rewritten as: 198b5c405d01!
+  abort: hidden revision '6' was rewritten as: 198b5c405d01
   (use --hidden to access hidden revisions)
   [255]
 
--- a/tests/test-minitopic.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-minitopic.t	Wed Dec 02 09:40:33 2020 +0800
@@ -85,13 +85,13 @@
   $ hg push enabled
   pushing to http://localhost:$HGPORT/
   searching for changes
-  abort: push creates new remote head 22c9514ed811!
+  abort: push creates new remote head 22c9514ed811
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push disabled
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head 22c9514ed811!
+  abort: push creates new remote head 22c9514ed811
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -151,7 +151,7 @@
   $ hg push disabled
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head f31af349535e!
+  abort: push creates new remote head f31af349535e
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push enabled
@@ -220,7 +220,7 @@
   $ hg push enabled
   pushing to http://localhost:$HGPORT/
   searching for changes
-  abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A'!
+  abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push disabled
--- a/tests/test-obsolete.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-obsolete.t	Wed Dec 02 09:40:33 2020 +0800
@@ -314,7 +314,7 @@
 ..  $ hg push ../other-old
 ..  pushing to ../other-old
 ..  searching for changes
-..  abort: push includes an unstable changeset: 909a0fb57e5d!
+..  abort: push includes an unstable changeset: 909a0fb57e5d
 ..  (use 'hg evolve' to get a stable history or --force to ignore warnings)
 ..  [255]
 ..  $ hg push -f ../other-old
--- a/tests/test-prune.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-prune.t	Wed Dec 02 09:40:33 2020 +0800
@@ -317,7 +317,7 @@
   bookmark 'todelete' deleted
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
-  abort: hidden revision 'dcbb326fdec2' is pruned!
+  abort: hidden revision 'dcbb326fdec2' is pruned
   (use --hidden to access hidden revisions)
   [255]
   $ hg id -ir d62d843c9a01
@@ -351,7 +351,7 @@
   3 changesets pruned
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
-  abort: hidden revision '6' is pruned!
+  abort: hidden revision '6' is pruned
   (use --hidden to access hidden revisions)
   [255]
 
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -90,7 +90,7 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head dc44c53142f0!
+  abort: push creates new remote head dc44c53142f0
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-multi-topics-F3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-multi-topics-F3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -94,7 +94,7 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head 57530ca5eb24 on branch 'default:Y'!
+  abort: push creates new remote head 57530ca5eb24 on branch 'default:Y'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-multibranches-E3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-multibranches-E3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -90,7 +90,7 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head dc44c53142f0!
+  abort: push creates new remote head dc44c53142f0
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-partial-C1.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-partial-C1.t	Wed Dec 02 09:40:33 2020 +0800
@@ -77,6 +77,6 @@
   $ hg push
   pushing to $TESTTMP/server
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4!
+  abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
--- a/tests/test-push-checkheads-partial-C2.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-partial-C2.t	Wed Dec 02 09:40:33 2020 +0800
@@ -79,7 +79,7 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/C2/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef!
+  abort: push creates new remote head f6082bc4ffef
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-partial-C3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-partial-C3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -78,7 +78,7 @@
   $ hg push
   pushing to $TESTTMP/C3/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6!
+  abort: push creates new remote head 0f88766e02d6
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-partial-C4.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-partial-C4.t	Wed Dec 02 09:40:33 2020 +0800
@@ -79,7 +79,7 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/C4/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6!
+  abort: push creates new remote head 0f88766e02d6
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-unpushed-D1.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D1.t	Wed Dec 02 09:40:33 2020 +0800
@@ -71,7 +71,7 @@
   $ hg push -r 'desc(B0)'
   pushing to $TESTTMP/D1/server (glob)
   searching for changes
-  abort: push creates new remote head 74ff5441d343!
+  abort: push creates new remote head 74ff5441d343
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-unpushed-D2.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D2.t	Wed Dec 02 09:40:33 2020 +0800
@@ -92,7 +92,7 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/D2/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6!
+  abort: push creates new remote head 0f88766e02d6
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-unpushed-D3.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D3.t	Wed Dec 02 09:40:33 2020 +0800
@@ -91,13 +91,13 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef!
+  abort: push creates new remote head f6082bc4ffef
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push --rev 'desc(B1)'
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4!
+  abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -109,7 +109,7 @@
   $ hg push
   pushing to $TESTTMP/D3/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4!
+  abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-unpushed-D4.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D4.t	Wed Dec 02 09:40:33 2020 +0800
@@ -109,7 +109,7 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D4/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef!
+  abort: push creates new remote head f6082bc4ffef
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-push-checkheads-unpushed-D5.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D5.t	Wed Dec 02 09:40:33 2020 +0800
@@ -98,7 +98,7 @@
   $ hg push --rev 'desc(B1)'
   pushing to $TESTTMP/D5/server (glob)
   searching for changes
-  abort: push creates new remote head 25c56d33e4c4!
+  abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push --rev 'desc(A1)'
--- a/tests/test-push-checkheads-unpushed-D6.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-push-checkheads-unpushed-D6.t	Wed Dec 02 09:40:33 2020 +0800
@@ -79,7 +79,7 @@
   $ hg push --rev 'desc(C0)'
   pushing to $TESTTMP/D6/server (glob)
   searching for changes
-  abort: push creates new remote head 0f88766e02d6!
+  abort: push creates new remote head 0f88766e02d6
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-sharing.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-sharing.t	Wed Dec 02 09:40:33 2020 +0800
@@ -345,7 +345,7 @@
   pushing to ../public
   searching for changes
   remote has heads on branch 'default' that are not known locally: 9d21d673314a
-  abort: push creates new remote head 3363442626b3 with bookmark 'bug15'!
+  abort: push creates new remote head 3363442626b3 with bookmark 'bug15'
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg pull ../public
--- a/tests/test-topic-flow-publish-flag.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-topic-flow-publish-flag.t	Wed Dec 02 09:40:33 2020 +0800
@@ -394,7 +394,7 @@
   $ hg push -r 'desc("c_dN0")' --publish
   pushing to $TESTTMP/bare-branch-server
   searching for changes
-  abort: push creates new remote head 4dcd0be9db96!
+  abort: push creates new remote head 4dcd0be9db96
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
--- a/tests/test-topic-push.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-topic-push.t	Wed Dec 02 09:40:33 2020 +0800
@@ -81,7 +81,7 @@
   $ hg push
   pushing to $TESTTMP/main (glob)
   searching for changes
-  abort: push creates new remote head 9fe81b7f425d!
+  abort: push creates new remote head 9fe81b7f425d
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg outgoing -r 'desc(CB)' -G
@@ -111,7 +111,7 @@
   $ hg push
   pushing to $TESTTMP/main (glob)
   searching for changes
-  abort: push creates new remote branches: mountain!
+  abort: push creates new remote branches: mountain
   (use 'hg push --new-branch' to create new remote branches)
   [255]
   $ hg push --new-branch
@@ -210,10 +210,10 @@
   
 
   $ hg outgoing draft --topic nonexistent
-  abort: topic 'nonexistent' does not exist!
+  abort: topic 'nonexistent' does not exist
   [255]
   $ hg push draft --topic nonexistent
-  abort: topic 'nonexistent' does not exist!
+  abort: topic 'nonexistent' does not exist
   [255]
 
   $ hg up babar
@@ -254,7 +254,7 @@
   $ hg push
   pushing to $TESTTMP/main (glob)
   searching for changes
-  abort: push creates new remote head 67f579af159d!
+  abort: push creates new remote head 67f579af159d
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg log -G
@@ -300,7 +300,7 @@
   $ hg push ssh://user@dummy/draft
   pushing to ssh://user@dummy/draft
   searching for changes
-  abort: push creates new remote head 84eaf32db6c3!
+  abort: push creates new remote head 84eaf32db6c3
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg log -G
@@ -342,7 +342,7 @@
   $ hg push ssh://user@dummy/main
   pushing to ssh://user@dummy/main
   searching for changes
-  abort: push creates new remote head 67f579af159d!
+  abort: push creates new remote head 67f579af159d
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg log -G
@@ -384,7 +384,7 @@
   $ hg push draft
   pushing to $TESTTMP/draft (glob)
   searching for changes
-  abort: push creates new remote head f0bc62a661be on branch 'default:babar'!
+  abort: push creates new remote head f0bc62a661be on branch 'default:babar'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -428,7 +428,7 @@
   $ hg push draft -r .
   pushing to $TESTTMP/draft (glob)
   searching for changes
-  abort: push creates new remote head 4937c4cad39e!
+  abort: push creates new remote head 4937c4cad39e
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-topic-tutorial.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-topic-tutorial.t	Wed Dec 02 09:40:33 2020 +0800
@@ -1077,7 +1077,7 @@
   $ hg push --rev drinks
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 70dfa201ed73!
+  abort: push creates new remote head 70dfa201ed73
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -1097,7 +1097,7 @@
   $ hg push
   pushing to $TESTTMP/server (glob)
   searching for changes
-  abort: push creates new remote head 4cd7c1591a67!
+  abort: push creates new remote head 4cd7c1591a67
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
--- a/tests/test-topic.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-topic.t	Wed Dec 02 09:40:33 2020 +0800
@@ -649,7 +649,7 @@
    * query (1 changesets)
   $ hg pull ../pinky -r narf
   pulling from ../pinky
-  abort: unknown revision 'narf'!
+  abort: unknown revision 'narf'
   [255]
   $ hg pull ../pinky -r default
   pulling from ../pinky
@@ -823,13 +823,13 @@
   $ tlog 'topic(wdir())'
   9: fran
   $ tlog 'topic(nonsense)'
-  abort: unknown revision 'nonsense'!
+  abort: unknown revision 'nonsense'
   [255]
 
 Pattern matching in topic() revset
   $ tlog 'topic("re:nonsense")'
   $ tlog 'topic("literal:nonsense")'
-  abort: topic 'nonsense' does not exist!
+  abort: topic 'nonsense' does not exist
   [255]
 
 Deactivate the topic.
--- a/tests/test-userguide.t	Wed Nov 25 13:50:37 2020 +0100
+++ b/tests/test-userguide.t	Wed Dec 02 09:40:33 2020 +0800
@@ -20,7 +20,7 @@
   $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
   saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
   $ hg log -r 23fe4ac6d3f1
-  abort: unknown revision '23fe4ac6d3f1'!
+  abort: unknown revision '23fe4ac6d3f1'
   [255]
   $ hg identify -in
   fe0ecd3bd2a4 1
@@ -38,7 +38,7 @@
   $ echo 'tweak feature Y' >> file1.c
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
-  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
+  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037
   (use --hidden to access hidden revisions)
   [255]
   $ hg --hidden shortlog -G