Mercurial > evolve
diff tests/test-uncommit.t @ 3747:1e103c7f7663
test: update to new outputs
Mercurial core ea63a2004d09 update the hidden changeset warning during update
after the effective update.
CORE-TEST-OUTPUT-UPDATE: ea63a2004d09
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 21 May 2018 14:56:51 +0200 |
| parents | 589649021ea1 |
| children | f7afd3a158e3 79de4e86d9a4 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Mon May 21 13:07:49 2018 +0200 +++ b/tests/test-uncommit.t Mon May 21 14:56:51 2018 +0200 @@ -238,10 +238,10 @@ Test phase is preserved, no local changes $ 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) + updated to hidden changeset 5eb72dbe0cb4 + (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) working directory parent is obsolete! (5eb72dbe0cb4) (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge @@ -287,9 +287,9 @@ 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 + updated to 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) $ hg --config extensions.purge= purge