Mercurial > evolve
comparison tests/test-evolve-obshistory-lots-of-splits.t @ 4513:d70db7e455dc mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 11 Apr 2019 22:42:13 +0200 |
parents | 522abf1d70b7 b58e45aa9be2 |
children | ef1c322c389d ecf0f3bc7468 |
comparison
equal
deleted
inserted
replaced
4512:7a779a288793 | 4513:d70db7e455dc |
---|---|
279 $ hg update de7290d8b885 | 279 $ hg update de7290d8b885 |
280 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! | 280 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! |
281 (use --hidden to access hidden revisions) | 281 (use --hidden to access hidden revisions) |
282 [255] | 282 [255] |
283 $ hg update --hidden 'min(desc(A0))' | 283 $ hg update --hidden 'min(desc(A0))' |
284 updating to a hidden changeset de7290d8b885 | |
285 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) | |
284 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
285 updated to hidden changeset de7290d8b885 | |
286 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) | |
287 working directory parent is obsolete! (de7290d8b885) | 287 working directory parent is obsolete! (de7290d8b885) |
288 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) | 288 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |