Mercurial > evolve
changeset 3432:f57be161f34b
test: update with new 'update' hint about obsfate
CORE-TEST-OUTPUT-UPDATE: 35a0f6f31eef
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Jan 2018 11:59:36 +0100 |
| parents | 2e703ed1c713 |
| children | a53a49e80764 |
| 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, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-evolve-obshistory.t Sat Jan 20 11:59:36 2018 +0100 @@ -204,6 +204,7 @@ [255] $ hg update --hidden "desc(A0)" updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) 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) @@ -305,6 +306,7 @@ [255] $ hg up --hidden -r 'desc(B0)' updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' is pruned) 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) @@ -502,6 +504,7 @@ [255] $ hg update --hidden 'min(desc(A0))' updating to a hidden changeset 471597cad322 + (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 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) @@ -780,6 +783,7 @@ [255] $ hg update --hidden 'min(desc(A0))' updating to a hidden changeset de7290d8b885 + (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) 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) @@ -1002,6 +1006,7 @@ [255] $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 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) @@ -1011,6 +1016,7 @@ [255] $ hg update --hidden 'desc(B0)' updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 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) @@ -1047,6 +1053,7 @@ $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 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) @@ -1342,6 +1349,7 @@ [255] $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 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) @@ -1569,11 +1577,13 @@ [255] $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 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 + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 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 Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-evolve-templates.t Sat Jan 20 11:59:36 2018 +0100 @@ -65,6 +65,7 @@ --------------- $ hg up 'desc(A0)' --hidden updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) 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) @@ -157,6 +158,7 @@ $ hg up 'desc(A1)' --hidden updating to a hidden changeset a468dc9b3633 + (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) 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) @@ -342,6 +344,7 @@ $ hg up 'obsolete()' --hidden updating to a hidden changeset 471597cad322 + (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 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) @@ -482,6 +485,7 @@ $ hg up 'desc(A0)' --hidden updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 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) @@ -508,6 +512,7 @@ $ hg up 'desc(B0)' --hidden updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 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) @@ -624,6 +629,7 @@ $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 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) @@ -664,6 +670,7 @@ $ hg up 'desc(A0)' --hidden updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 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) @@ -839,6 +846,7 @@ $ hg up 'desc(A0)' --hidden updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 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) @@ -863,6 +871,7 @@ $ hg up 'desc(B0)' --hidden updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 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) @@ -896,6 +905,7 @@ $ hg up 'desc(B1)' --hidden updating to a hidden changeset b7ea6d14e664 + (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) 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) @@ -1173,6 +1183,7 @@ $ hg up -r "desc(B0)" --hidden updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' is pruned) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor) @@ -1538,6 +1549,7 @@ $ hg up --hidden 4 updating to a hidden changeset 9bd10a0775e4 + (hidden revision '9bd10a0775e4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (9bd10a0775e4) (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) @@ -1602,6 +1614,7 @@ $ hg up "desc(A0)" --hidden updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' is pruned) 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 Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-obsolete.t Sat Jan 20 11:59:36 2018 +0100 @@ -122,6 +122,7 @@ - 725c380fe99b $ hg up --hidden 3 -q updating to a hidden changeset 0d3f46688ccc + (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents @@ -707,6 +708,7 @@ $ hg up --hidden 3 -q updating to a hidden changeset 0d3f46688ccc + (hidden revision '0d3f46688ccc' has diverged) working directory parent is obsolete! (0d3f46688ccc) $ hg evolve parent is obsolete with multiple successors: @@ -726,6 +728,7 @@ $ hg up --hidden 2 updating to a hidden changeset 4538525df7e2 + (hidden revision '4538525df7e2' has diverged) 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 Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-stabilize-result.t Sat Jan 20 11:59:36 2018 +0100 @@ -218,6 +218,7 @@ $ hg amend $ hg up --hidden 3932c176bbaa updating to a hidden changeset 3932c176bbaa + (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) 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) @@ -327,6 +328,7 @@ $ hg up --hidden 3932c176bbaa updating to a hidden changeset 3932c176bbaa + (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) 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 Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-touch.t Sat Jan 20 11:59:36 2018 +0100 @@ -33,6 +33,7 @@ $ hg commit -m ab --amend $ hg up --hidden 1 updating to a hidden changeset [0-9a-f]{12} (re) + (hidden revision '*' was rewritten as: *) (glob) 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 Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-uncommit.t Sat Jan 20 11:59:36 2018 +0100 @@ -239,6 +239,7 @@ $ hg up -C 3 --hidden updating to a hidden changeset 5eb72dbe0cb4 + (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) working directory parent is obsolete! (5eb72dbe0cb4) @@ -287,6 +288,7 @@ $ hg up -C 3 --hidden updating to a hidden changeset 5eb72dbe0cb4 + (hidden revision '5eb72dbe0cb4' has diverged) 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)