Mercurial > evolve
diff tests/test-evolve-obshistory-phase-divergent.t @ 3923:257481642686 mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:57:13 +0200 |
| parents | f7afd3a158e3 |
| children | f3713d41b85b 1752a2e7a226 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-phase-divergent.t Thu Aug 02 02:15:48 2018 +0200 +++ b/tests/test-evolve-obshistory-phase-divergent.t Thu Aug 02 01:57:13 2018 +0200 @@ -37,9 +37,9 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg phase -p .