Mercurial > evolve

comparison tests/test-evolve-obshistory-lots-of-splits.t @ 3909:f7afd3a158e3 mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8ed81c330e82
children f3713d41b85b 522abf1d70b7
comparison
equal deleted inserted replaced
3908:2af10d0a59e0 3909:f7afd3a158e3
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)