Mercurial > evolve
changeset 3410:39112fd4d5ed stable
branching: backed out test output changes from core-02fdb8c018aa
This backs out evolve-1905aac253f0.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:42:44 +0100 |
| parents | 7a322f58fee3 |
| children | e1f3e43a50a4 |
| 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, 0 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-evolve-obshistory.t Mon Jan 15 19:42:44 2018 +0100 @@ -203,7 +203,6 @@ (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) @@ -304,7 +303,6 @@ (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) @@ -501,7 +499,6 @@ (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) @@ -779,7 +776,6 @@ (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) @@ -1001,7 +997,6 @@ (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) @@ -1010,7 +1005,6 @@ (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) @@ -1046,7 +1040,6 @@ 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) @@ -1341,7 +1334,6 @@ (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) @@ -1568,12 +1560,10 @@ (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 Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-evolve-templates.t Mon Jan 15 19:42:44 2018 +0100 @@ -64,7 +64,6 @@ 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) @@ -156,7 +155,6 @@ $ 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) @@ -341,7 +339,6 @@ --------------- $ 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) @@ -481,7 +478,6 @@ --------------- $ 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) @@ -507,7 +503,6 @@ 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) @@ -623,7 +618,6 @@ 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) @@ -663,7 +657,6 @@ --------------- $ 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) @@ -838,7 +831,6 @@ --------------- $ 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) @@ -862,7 +854,6 @@ 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) @@ -895,7 +886,6 @@ $ 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) @@ -1600,7 +1590,6 @@ ------------ $ 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 Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-obsolete.t Mon Jan 15 19:42:44 2018 +0100 @@ -121,7 +121,6 @@ 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 @@ -702,7 +701,6 @@ $ 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: @@ -721,7 +719,6 @@ 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 Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-stabilize-result.t Mon Jan 15 19:42:44 2018 +0100 @@ -217,7 +217,6 @@ $ 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) @@ -326,7 +325,6 @@ ------------------------------------------------- $ 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 Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-touch.t Mon Jan 15 19:42:44 2018 +0100 @@ -32,7 +32,6 @@ $ 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 Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-uncommit.t Mon Jan 15 19:42:44 2018 +0100 @@ -238,7 +238,6 @@ 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) @@ -286,7 +285,6 @@ 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)