Mercurial > evolve
diff tests/test-stabilize-result.t @ 3909:f7afd3a158e3 mercurial-4.6
test-compat: backout change to 1e103c7f7663
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 11:45:01 +0200 |
| parents | 629558d09898 |
| children | d00f0c369bc7 eb4d07a0b19f |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Tue Jul 31 11:25:57 2018 +0200 +++ b/tests/test-stabilize-result.t Tue Jul 31 11:45:01 2018 +0200 @@ -237,9 +237,9 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 3932c176bbaa + updating to a hidden changeset 3932c176bbaa + (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: d2f173e25686) $ mv a a.old @@ -345,9 +345,9 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa + updating to a hidden changeset 3932c176bbaa + (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: 4d6ed26797bc) $ echo 'gotta break' >> a