Mercurial > evolve
diff tests/test-evolve-obshistory-content-divergent.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 | 11b775fddda8 |
| children | f3713d41b85b 1752a2e7a226 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-content-divergent.t Tue Jul 31 11:25:57 2018 +0200 +++ b/tests/test-evolve-obshistory-content-divergent.t Tue Jul 31 11:45:01 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 amend -m "A2" @@ -337,8 +337,8 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)