comparison tests/test-evolve-obshistory-lots-of-splits.t @ 4363:a2fdbece7ce1 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents d00f0c369bc7 8bd60e09dfb4
children f54bb6eaf5e6
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
279 $ hg update de7290d8b885 279 $ hg update de7290d8b885
280 abort: hidden revision 'de7290d8b885'! 280 abort: hidden revision 'de7290d8b885'!
281 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 281 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
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)
286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 284 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
287 working directory parent is obsolete! (de7290d8b885) 285 working directory parent is obsolete! (de7290d8b885)
288 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) 286 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)