Mercurial > evolve
comparison tests/test-evolve-obshistory-split.t @ 3924:f3713d41b85b mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:58:44 +0200 |
| parents | f7afd3a158e3 |
| children | d00f0c369bc7 8bd60e09dfb4 |
comparison
equal
deleted
inserted
replaced
| 3923:257481642686 | 3924:f3713d41b85b |
|---|---|
| 197 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) | 197 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
| 198 note: testing split | 198 note: testing split |
| 199 (No patch available, too many successors (2)) | 199 (No patch available, too many successors (2)) |
| 200 | 200 |
| 201 $ hg update 471597cad322 | 201 $ hg update 471597cad322 |
| 202 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! | 202 abort: hidden revision '471597cad322'! |
| 203 (use --hidden to access hidden revisions) | 203 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
| 204 [255] | 204 [255] |
| 205 $ hg update --hidden 'min(desc(A0))' | 205 $ hg update --hidden 'min(desc(A0))' |
| 206 updating to a hidden changeset 471597cad322 | 206 updating to a hidden changeset 471597cad322 |
| 207 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) | 207 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
| 208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |