Mercurial > evolve
changeset 6423:b71d6235fa01 mercurial-5.9
test-compat: merge mercurial-6.0 into mercurial-5.9
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 24 Feb 2023 19:44:10 +0400 |
parents | faea18a26188 (diff) acdeec2dc732 (current diff) |
children | 7766aee4a67a 96749dc32fa1 |
files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
diffstat | 11 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-amend.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-content-divergent.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-fold.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-prune.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-evolve-obshistory-split.t Fri Feb 24 19:44:10 2023 +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-namespaces.t Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-namespaces.t Fri Feb 24 19:44:10 2023 +0400 @@ -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
--- a/tests/test-prune.t Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-prune.t Fri Feb 24 19:44:10 2023 +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 Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-topic.t Fri Feb 24 19:44:10 2023 +0400 @@ -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
--- a/tests/test-userguide.t Fri Feb 24 19:33:05 2023 +0400 +++ b/tests/test-userguide.t Fri Feb 24 19:44:10 2023 +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 |