Mercurial > evolve

changeset 6279:1fa97a783de4 mercurial-5.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.0 into mercurial-5.9
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Jul 2022 17:14:54 +0400
parents 4c22cffdb573 (diff) fb19577e2506 (current diff)
children 9befdde455e7 a159b6195fe3
files
diffstat 10 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Tue Jul 12 17:14:54 2022 +0400
@@ -354,7 +354,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-amend.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-amend.t	Tue Jul 12 17:14:54 2022 +0400
@@ -205,7 +205,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden "desc(A0)"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-content-divergent.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-content-divergent.t	Tue Jul 12 17:14:54 2022 +0400
@@ -441,7 +441,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' has diverged
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
--- a/tests/test-evolve-obshistory-fold.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-fold.t	Tue Jul 12 17:14:54 2022 +0400
@@ -291,7 +291,7 @@
   $ hg update 471f378eab4c
   abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
@@ -301,7 +301,7 @@
   $ hg update 0dec01379d3b
   abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Tue Jul 12 17:14:54 2022 +0400
@@ -446,7 +446,7 @@
   $ hg update de7290d8b885
   abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset de7290d8b885
--- a/tests/test-evolve-obshistory-prune.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-prune.t	Tue Jul 12 17:14:54 2022 +0400
@@ -107,7 +107,7 @@
   $ hg up 0dec01379d3b
   abort: hidden revision '0dec01379d3b' is pruned
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg up --hidden -r 'desc(B0)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
--- a/tests/test-evolve-obshistory-split.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-evolve-obshistory-split.t	Tue Jul 12 17:14:54 2022 +0400
@@ -258,7 +258,7 @@
   $ hg update 471597cad322
   abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg update --hidden 'min(desc(A0))'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471597cad322
--- a/tests/test-prune.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-prune.t	Tue Jul 12 17:14:54 2022 +0400
@@ -306,7 +306,7 @@
   $ hg id -ir dcbb326fdec2
   abort: hidden revision 'dcbb326fdec2' is pruned
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
   $ hg bookmarks
@@ -340,7 +340,7 @@
   $ hg id -ir 6:2702dd0c91e7
   abort: hidden revision '6' is pruned
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
 
   $ hg debugobsstorestat
   markers total:                      7
--- a/tests/test-topic.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-topic.t	Tue Jul 12 17:14:54 2022 +0400
@@ -819,13 +819,13 @@
   9: fran
   $ tlog 'topic(nonsense)'
   abort: unknown revision 'nonsense'
-  [10]
+  [255]
 
 Pattern matching in topic() revset
   $ tlog 'topic("re:nonsense")'
   $ tlog 'topic("literal:nonsense")'
   abort: topic 'nonsense' does not exist
-  [10]
+  [255]
 
 Deactivate the topic.
   $ hg topics
--- a/tests/test-userguide.t	Tue Jul 12 16:51:22 2022 +0400
+++ b/tests/test-userguide.t	Tue Jul 12 17:14:54 2022 +0400
@@ -21,7 +21,7 @@
   saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
   $ hg log -r 23fe4ac6d3f1
   abort: unknown revision '23fe4ac6d3f1'
-  [10]
+  [255]
   $ hg identify -in
   fe0ecd3bd2a4 1
 
@@ -40,7 +40,7 @@
   $ hg shortlog -q -r fe0ecd3bd2a4
   abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037
   (use --hidden to access hidden revisions)
-  [10]
+  [255]
   $ hg --hidden shortlog -G
   @  2:934359450037  draft  implement feature Y
   |