Mercurial > evolve
diff tests/test-evolve-templates.t @ 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 | 577bfc34e19b |
line wrap: on
line diff
--- 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)