Mercurial > evolve
comparison tests/test-evolve-content-divergent-interrupted.t @ 4513:d70db7e455dc mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:42:13 +0200 |
| parents | d02a7c8cdee5 |
| children | f54bb6eaf5e6 3ef4980353af |
comparison
equal
deleted
inserted
replaced
| 4512:7a779a288793 | 4513:d70db7e455dc |
|---|---|
| 52 | 52 |
| 53 $ echo bar > d | 53 $ echo bar > d |
| 54 $ hg amend | 54 $ hg amend |
| 55 | 55 |
| 56 $ hg up c41c793e0ef1 --hidden | 56 $ hg up c41c793e0ef1 --hidden |
| 57 updating to a hidden changeset c41c793e0ef1 | |
| 58 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) | |
| 57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 58 updated to hidden changeset c41c793e0ef1 | |
| 59 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) | |
| 60 working directory parent is obsolete! (c41c793e0ef1) | 60 working directory parent is obsolete! (c41c793e0ef1) |
| 61 (use 'hg evolve' to update to its successor: e49523854bc8) | 61 (use 'hg evolve' to update to its successor: e49523854bc8) |
| 62 | 62 |
| 63 $ echo foobar > d | 63 $ echo foobar > d |
| 64 $ hg amend | 64 $ hg amend |
| 276 $ echo bar > c | 276 $ echo bar > c |
| 277 $ hg add c | 277 $ hg add c |
| 278 $ hg amend | 278 $ hg amend |
| 279 | 279 |
| 280 $ hg up --hidden c41c793e0ef1 | 280 $ hg up --hidden c41c793e0ef1 |
| 281 updating to a hidden changeset c41c793e0ef1 | |
| 282 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) | |
| 281 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 283 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 282 updated to hidden changeset c41c793e0ef1 | |
| 283 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) | |
| 284 working directory parent is obsolete! (c41c793e0ef1) | 284 working directory parent is obsolete! (c41c793e0ef1) |
| 285 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) | 285 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
| 286 $ echo bar > d | 286 $ echo bar > d |
| 287 $ hg amend | 287 $ hg amend |
| 288 2 new content-divergent changesets | 288 2 new content-divergent changesets |
| 420 | 420 |
| 421 $ echo bar > d | 421 $ echo bar > d |
| 422 $ hg amend | 422 $ hg amend |
| 423 | 423 |
| 424 $ hg up c41c793e0ef1 --hidden | 424 $ hg up c41c793e0ef1 --hidden |
| 425 updating to a hidden changeset c41c793e0ef1 | |
| 426 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) | |
| 425 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 427 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 426 updated to hidden changeset c41c793e0ef1 | |
| 427 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) | |
| 428 working directory parent is obsolete! (c41c793e0ef1) | 428 working directory parent is obsolete! (c41c793e0ef1) |
| 429 (use 'hg evolve' to update to its successor: e49523854bc8) | 429 (use 'hg evolve' to update to its successor: e49523854bc8) |
| 430 | 430 |
| 431 $ echo foobar > d | 431 $ echo foobar > d |
| 432 $ hg amend | 432 $ hg amend |