Mercurial > evolve
diff tests/test-stabilize-result.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 | ec460882eab7 |
| children | 3fe3f3070df9 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Mon May 21 13:07:49 2018 +0200 +++ b/tests/test-stabilize-result.t Mon May 21 14:56:51 2018 +0200 @@ -239,9 +239,9 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to 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) $ mv a a.old @@ -349,9 +349,9 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to 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) $ echo 'gotta break' >> a