# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1679439851 10800
# Node ID 96749dc32fa1cf471804571780e3747a67fc021e
# Parent  b71d6235fa01eb854858a162d91c88fc28aab343# Parent  677411ebbe3520302f90af8f036195c96a2a23c0
test-compat: merge mercurial-6.0 into mercurial-5.9

diff -r 677411ebbe35 -r 96749dc32fa1 hgext3rd/evolve/__init__.py
diff -r 677411ebbe35 -r 96749dc32fa1 hgext3rd/evolve/metadata.py
diff -r 677411ebbe35 -r 96749dc32fa1 hgext3rd/topic/__init__.py
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-amend.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-content-divergent.t
--- a/tests/test-evolve-obshistory-content-divergent.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-content-divergent.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-fold.t
--- a/tests/test-evolve-obshistory-fold.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-fold.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-prune.t
--- a/tests/test-evolve-obshistory-prune.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-prune.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-evolve-obshistory-split.t
--- a/tests/test-evolve-obshistory-split.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-evolve-obshistory-split.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-namespaces.t
--- a/tests/test-namespaces.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-namespaces.t	Tue Mar 21 20:04:11 2023 -0300
@@ -69,7 +69,7 @@
 
   $ hg up alice
   abort: unknown revision 'alice'
-  [10]
+  [255]
 
 Revsets
 
@@ -89,12 +89,12 @@
   0: alice
   $ nslog 'topicnamespace(nonsense)'
   abort: unknown revision 'nonsense'
-  [10]
+  [255]
 
   $ nslog 'topicnamespace("re:nonsense")'
   $ nslog 'topicnamespace("literal:nonsense")'
   abort: topic namespace 'nonsense' does not exist
-  [10]
+  [255]
 
 Parsing
 
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-prev-next.t
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-prune.t
--- a/tests/test-prune.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-prune.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-topic.t
--- a/tests/test-topic.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-topic.t	Tue Mar 21 20:04:11 2023 -0300
@@ -840,13 +840,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
diff -r 677411ebbe35 -r 96749dc32fa1 tests/test-userguide.t
--- a/tests/test-userguide.t	Mon Mar 20 23:19:35 2023 -0300
+++ b/tests/test-userguide.t	Tue Mar 21 20:04:11 2023 -0300
@@ -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
   |