Mercurial > evolve
diff tests/test-obsolete.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 | d166b3dc5e8a |
children | f7afd3a158e3 ef22eef37ecc |
line wrap: on
line diff
--- a/tests/test-obsolete.t Mon May 21 13:07:49 2018 +0200 +++ b/tests/test-obsolete.t Mon May 21 14:56:51 2018 +0200 @@ -121,7 +121,7 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc + updated to hidden changeset 0d3f46688ccc (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) @@ -707,7 +707,7 @@ $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc + updated to hidden changeset 0d3f46688ccc (hidden revision '0d3f46688ccc' has diverged) working directory parent is obsolete! (0d3f46688ccc) $ hg evolve @@ -727,9 +727,9 @@ 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 + updated to 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) $ hg export 9468a5f5d8b2 | hg import -