Mercurial > evolve
comparison tests/test-evolve-obshistory-fold.t @ 5834:c2484b0217ee mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 14:49:22 +0800 |
| parents | 0f32359bcf3e |
| children |
comparison
equal
deleted
inserted
replaced
| 5833:be8f7eb3f3a0 | 5834:c2484b0217ee |
|---|---|
| 322 $ hg update 471f378eab4c | 322 $ hg update 471f378eab4c |
| 323 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! | 323 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
| 324 (use --hidden to access hidden revisions) | 324 (use --hidden to access hidden revisions) |
| 325 [255] | 325 [255] |
| 326 $ hg update --hidden 'desc(A0)' | 326 $ hg update --hidden 'desc(A0)' |
| 327 updating to a hidden changeset 471f378eab4c | |
| 328 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
| 327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 329 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 328 updated to hidden changeset 471f378eab4c | |
| 329 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
| 330 working directory parent is obsolete! (471f378eab4c) | 330 working directory parent is obsolete! (471f378eab4c) |
| 331 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 331 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 332 $ hg update 0dec01379d3b | 332 $ hg update 0dec01379d3b |
| 333 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! | 333 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! |
| 334 (use --hidden to access hidden revisions) | 334 (use --hidden to access hidden revisions) |
| 335 [255] | 335 [255] |
| 336 $ hg update --hidden 'desc(B0)' | 336 $ hg update --hidden 'desc(B0)' |
| 337 updating to a hidden changeset 0dec01379d3b | |
| 338 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
| 337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 339 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 338 updated to hidden changeset 0dec01379d3b | |
| 339 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
| 340 working directory parent is obsolete! (0dec01379d3b) | 340 working directory parent is obsolete! (0dec01379d3b) |
| 341 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 341 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 342 | 342 |
| 343 Check output of the server | 343 Check output of the server |
| 344 -------------------------- | 344 -------------------------- |