Mercurial > evolve
diff tests/test-evolve-public-content-divergent-main.t @ 4784:ecf0f3bc7468 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 14:43:17 +0200 |
| parents | 3ef4980353af b6c819facbe8 |
| children | 1752a2e7a226 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-main.t Mon Jul 29 14:43:15 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-main.t Mon Jul 29 14:43:17 2019 +0200 @@ -48,7 +48,7 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updated to hidden changeset 5f6d8a4bf34a + updating to a hidden changeset 5f6d8a4bf34a (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) working directory parent is obsolete! (5f6d8a4bf34a) @@ -142,7 +142,7 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updated to hidden changeset 5f6d8a4bf34a + updating to a hidden changeset 5f6d8a4bf34a (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) working directory parent is obsolete! (5f6d8a4bf34a)