Mercurial > evolve
changeset 3360:1905aac253f0
test: update output to 02fdb8c018aa
Now that we have directaccess in core, we get a new warning message when
updating to a hidden changeset. Update the tests.
CORE-TEST-OUTPUT-UPDATE: 02fdb8c018aa
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 05 Jan 2018 09:51:07 +0100 |
| parents | ae6fddf39933 |
| children | 9df35258e0c5 |
| files | tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-stabilize-result.t tests/test-touch.t tests/test-uncommit.t |
| diffstat | 6 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-evolve-obshistory.t Fri Jan 05 09:51:07 2018 +0100 @@ -178,6 +178,7 @@ (use --hidden to access hidden revisions; successor: 4ae3a4151de9) [255] $ hg update --hidden "desc(A0)" + updating to a hidden changeset 471f378eab4c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 4ae3a4151de9) @@ -278,6 +279,7 @@ (use --hidden to access hidden revisions; pruned) [255] $ hg up --hidden -r 'desc(B0)' + updating to a hidden changeset 0dec01379d3b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor) @@ -474,6 +476,7 @@ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) [255] $ hg update --hidden 'min(desc(A0))' + updating to a hidden changeset 471597cad322 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) @@ -751,6 +754,7 @@ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) [255] $ hg update --hidden 'min(desc(A0))' + updating to a hidden changeset de7290d8b885 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (de7290d8b885) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) @@ -968,6 +972,7 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -978,6 +983,7 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(B0)' + updating to a hidden changeset 0dec01379d3b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -1013,6 +1019,7 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) @@ -1293,6 +1300,7 @@ (use --hidden to access hidden revisions; diverged) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) @@ -1515,10 +1523,12 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update --hidden 0dec01379d3b + updating to a hidden changeset 0dec01379d3b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192)
--- a/tests/test-evolve-templates.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-evolve-templates.t Fri Jan 05 09:51:07 2018 +0100 @@ -64,6 +64,7 @@ Check templates --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -155,6 +156,7 @@ $ hg up 'desc(A1)' --hidden + updating to a hidden changeset a468dc9b3633 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (a468dc9b3633) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -339,6 +341,7 @@ --------------- $ hg up 'obsolete()' --hidden + updating to a hidden changeset 471597cad322 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) @@ -478,6 +481,7 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -503,6 +507,7 @@ o ea207398892e $ hg up 'desc(B0)' --hidden + updating to a hidden changeset 0dec01379d3b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -618,6 +623,7 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) @@ -657,6 +663,7 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) @@ -831,6 +838,7 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -854,6 +862,7 @@ o ea207398892e $ hg up 'desc(B0)' --hidden + updating to a hidden changeset 0dec01379d3b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -886,6 +895,7 @@ $ hg up 'desc(B1)' --hidden + updating to a hidden changeset b7ea6d14e664 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (b7ea6d14e664) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -1142,6 +1152,7 @@ ------------ $ hg up "desc(A0)" --hidden + updating to a hidden changeset 471f378eab4c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its parent successor)
--- a/tests/test-obsolete.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-obsolete.t Fri Jan 05 09:51:07 2018 +0100 @@ -121,6 +121,7 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q + updating to a hidden changeset 0d3f46688ccc working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents @@ -701,6 +702,7 @@ $ hg up --hidden 3 -q + updating to a hidden changeset 0d3f46688ccc working directory parent is obsolete! (0d3f46688ccc) $ hg evolve parent is obsolete with multiple successors: @@ -719,6 +721,7 @@ Check import reports new unstable changeset: $ hg up --hidden 2 + updating to a hidden changeset 4538525df7e2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-stabilize-result.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-stabilize-result.t Fri Jan 05 09:51:07 2018 +0100 @@ -217,6 +217,7 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 3932c176bbaa + updating to a hidden changeset 3932c176bbaa 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: d2f173e25686) @@ -325,6 +326,7 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa + updating to a hidden changeset 3932c176bbaa 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: f344982e63c4)
--- a/tests/test-touch.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-touch.t Fri Jan 05 09:51:07 2018 +0100 @@ -32,6 +32,7 @@ $ hg add b $ hg commit -m ab --amend $ hg up --hidden 1 + updating to a hidden changeset [0-9a-f]{12} (re) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (*) (glob) (use 'hg evolve' to update to its successor: *) (glob)
--- a/tests/test-uncommit.t Fri Jan 05 09:23:09 2018 +0100 +++ b/tests/test-uncommit.t Fri Jan 05 09:51:07 2018 +0100 @@ -238,6 +238,7 @@ Test phase is preserved, no local changes $ hg up -C 3 --hidden + updating to a hidden changeset 5eb72dbe0cb4 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) working directory parent is obsolete! (5eb72dbe0cb4) @@ -285,6 +286,7 @@ Test --all $ hg up -C 3 --hidden + updating to a hidden changeset 5eb72dbe0cb4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)