Mercurial > evolve
comparison tests/test-evolve-obshistory-split.t @ 5092:961e853e7efe mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 23 Jan 2020 17:41:00 +0700 |
| parents | f7bf347a17bb |
| children |
comparison
equal
deleted
inserted
replaced
| 5091:308c1e09f80f | 5092:961e853e7efe |
|---|---|
| 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 |