Mercurial > evolve
diff tests/test-uncommit.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 | eacf6149b678 |
line wrap: on
line diff
--- 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)