Mercurial > evolve
comparison tests/test-evolve-obshistory-lots-of-splits.t @ 4514:ef1c322c389d mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:42:14 +0200 |
| parents | 8bd60e09dfb4 d70db7e455dc |
| children | f54bb6eaf5e6 f7bf347a17bb |
comparison
equal
deleted
inserted
replaced
| 4513:d70db7e455dc | 4514:ef1c322c389d |
|---|---|
| 275 x de7290d8b885 (1) A0 | 275 x de7290d8b885 (1) A0 |
| 276 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) | 276 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
| 277 (No patch available, too many successors (4)) | 277 (No patch available, too many successors (4)) |
| 278 | 278 |
| 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'! |
| 281 (use --hidden to access hidden revisions) | 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 | 284 updating to a hidden changeset de7290d8b885 |
| 285 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) | 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 | 286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |