Commit be200864 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

branching: preserve test changes on stable

CORE-TEST-OUTPUT-UPDATE: 5ced12cfa41b
CORE-TEST-OUTPUT-UPDATE: 5105a9975407
Pipeline #27837 passed with stage
in 14 minutes and 59 seconds
......@@ -354,7 +354,7 @@
$ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
(use --hidden to access hidden revisions)
[255]
[10]
$ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
......
......@@ -205,7 +205,7 @@
$ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9
(use --hidden to access hidden revisions)
[255]
[10]
$ hg update --hidden "desc(A0)"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
......
......@@ -441,7 +441,7 @@
$ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' has diverged
(use --hidden to access hidden revisions)
[255]
[10]
$ hg update --hidden 'desc(A0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471f378eab4c
......
......@@ -291,7 +291,7 @@
$ hg update 471f378eab4c
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
(use --hidden to access hidden revisions)
[255]
[10]
$ 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)
[255]
[10]
$ hg update --hidden 'desc(B0)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
......
......@@ -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)
[255]
[10]
$ hg update --hidden 'min(desc(A0))'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset de7290d8b885
......
......@@ -107,7 +107,7 @@
$ hg up 0dec01379d3b
abort: hidden revision '0dec01379d3b' is pruned
(use --hidden to access hidden revisions)
[255]
[10]
$ hg up --hidden -r 'desc(B0)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0dec01379d3b
......
......@@ -258,7 +258,7 @@
$ hg update 471597cad322
abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a
(use --hidden to access hidden revisions)
[255]
[10]
$ hg update --hidden 'min(desc(A0))'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322
......
......@@ -306,7 +306,7 @@
$ hg id -ir dcbb326fdec2
abort: hidden revision 'dcbb326fdec2' is pruned
(use --hidden to access hidden revisions)
[255]
[10]
$ 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)
[255]
[10]
$ hg debugobsstorestat
markers total: 7
......
......@@ -819,9 +819,9 @@
9: fran
$ tlog 'topic(nonsense)'
abort: unknown revision 'nonsense'
[255]
[10]
Pattern matching in topic() revset
$ tlog 'topic("re:nonsense")'
$ tlog 'topic("literal:nonsense")'
abort: topic 'nonsense' does not exist
......@@ -823,9 +823,9 @@
Pattern matching in topic() revset
$ tlog 'topic("re:nonsense")'
$ tlog 'topic("literal:nonsense")'
abort: topic 'nonsense' does not exist
[255]
[10]
Deactivate the topic.
$ hg topics
......
......@@ -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'
[255]
[10]
$ 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)
[255]
[10]
$ hg --hidden shortlog -G
@ 2:934359450037 draft implement feature Y
|
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment