Mercurial > evolve
diff tests/test-evolve-obshistory-amend-then-fold.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 | 106c871dfebc |
| children | f3713d41b85b 1752a2e7a226 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t Tue Jul 31 11:25:57 2018 +0200 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Tue Jul 31 11:45:01 2018 +0200 @@ -231,15 +231,15 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update --hidden 0dec01379d3b + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update 0dec01379d3b