Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.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 | 308c1e09f80f |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Mon Jul 29 14:43:15 2019 +0200 +++ b/tests/test-evolve-content-divergent-corner-cases.t Mon Jul 29 14:43:17 2019 +0200 @@ -337,9 +337,9 @@ create some content divergence $ hg co dff6e52f5e41 --hidden + updating to a hidden changeset dff6e52f5e41 + (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset dff6e52f5e41 - (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) working directory parent is obsolete! (dff6e52f5e41) (use 'hg evolve' to update to its successor: 0825dcee2670) $ hg revert -r .^ c