Mercurial > evolve
comparison tests/test-evolve-content-divergent-interrupted.t @ 5729:3a1e07c27e4a
divergence-resolution: remove explicite hash in some command
This make them more robust to hash change.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 22 Jan 2021 04:54:51 +0100 |
| parents | e5d91fd1f319 |
| children | a119432bafc1 |
comparison
equal
deleted
inserted
replaced
| 5728:6dbfd71cdcba | 5729:3a1e07c27e4a |
|---|---|
| 277 rebasing 4:c41c793e0ef1 tip "added d" | 277 rebasing 4:c41c793e0ef1 tip "added d" |
| 278 $ echo bar > c | 278 $ echo bar > c |
| 279 $ hg add c | 279 $ hg add c |
| 280 $ hg amend | 280 $ hg amend |
| 281 | 281 |
| 282 $ hg up --hidden c41c793e0ef1 | 282 $ hg up --hidden 'min(desc("added d"))' |
| 283 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 |
| 284 updated to hidden changeset c41c793e0ef1 | 284 updated to hidden changeset c41c793e0ef1 |
| 285 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) | 285 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) |
| 286 working directory parent is obsolete! (c41c793e0ef1) | 286 working directory parent is obsolete! (c41c793e0ef1) |
| 287 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) | 287 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
| 334 | 334 |
| 335 Creating content-divergence on multiple parents when gca of divergent changesets | 335 Creating content-divergence on multiple parents when gca of divergent changesets |
| 336 is parent of one of the divergents and merging divergent leads to conflicts | 336 is parent of one of the divergents and merging divergent leads to conflicts |
| 337 --------------------------------------------------------------------------------- | 337 --------------------------------------------------------------------------------- |
| 338 | 338 |
| 339 $ hg up 69bdd23a9b0d | 339 $ hg up 'min(desc("added d"))' |
| 340 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 340 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 341 $ hg rm c | 341 $ hg rm c |
| 342 $ echo wat > d | 342 $ echo wat > d |
| 343 $ hg amend | 343 $ hg amend |
| 344 | 344 |
| 421 ----------------------------------------------------------------------- | 421 ----------------------------------------------------------------------- |
| 422 | 422 |
| 423 $ echo bar > d | 423 $ echo bar > d |
| 424 $ hg amend | 424 $ hg amend |
| 425 | 425 |
| 426 $ hg up c41c793e0ef1 --hidden | 426 $ hg up 'min(desc("added d"))' --hidden |
| 427 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 |
| 428 updated to hidden changeset c41c793e0ef1 | 428 updated to hidden changeset c41c793e0ef1 |
| 429 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) | 429 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
| 430 working directory parent is obsolete! (c41c793e0ef1) | 430 working directory parent is obsolete! (c41c793e0ef1) |
| 431 (use 'hg evolve' to update to its successor: e49523854bc8) | 431 (use 'hg evolve' to update to its successor: e49523854bc8) |