Mercurial > evolve
comparison tests/test-evolve-public-content-divergent.t @ 4454:f530850c8184
evolve: drop the "computing new diff message" for phase-divergence
Future code update will remove this message, dropping it early clarify the
future diff.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 26 Mar 2019 12:30:10 +0100 |
| parents | ea336a6592cc |
| children | 3caa4a459439 |
comparison
equal
deleted
inserted
replaced
| 4453:700b8b3a5a54 | 4454:f530850c8184 |
|---|---|
| 68 base: [1] added b | 68 base: [1] added b |
| 69 updating to "local" side of the conflict: 44f360db368f | 69 updating to "local" side of the conflict: 44f360db368f |
| 70 merging "other" content-divergent changeset 'dcdaf152280a' | 70 merging "other" content-divergent changeset 'dcdaf152280a' |
| 71 merging b | 71 merging b |
| 72 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 72 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 73 computing new diff | |
| 74 committed as c1aa9cfb6cf8 | 73 committed as c1aa9cfb6cf8 |
| 75 working directory is now at c1aa9cfb6cf8 | 74 working directory is now at c1aa9cfb6cf8 |
| 76 | 75 |
| 77 Following graph log shows that it correctly merged the two divergent csets: | 76 Following graph log shows that it correctly merged the two divergent csets: |
| 78 | 77 |
| 175 $ echo "I am foobar" > b | 174 $ echo "I am foobar" > b |
| 176 $ hg resolve -m --tool union | 175 $ hg resolve -m --tool union |
| 177 (no more unresolved files) | 176 (no more unresolved files) |
| 178 continue: hg evolve --continue | 177 continue: hg evolve --continue |
| 179 $ hg evolve --continue | 178 $ hg evolve --continue |
| 180 computing new diff | |
| 181 committed as 1a739394e9d4 | 179 committed as 1a739394e9d4 |
| 182 working directory is now at 1a739394e9d4 | 180 working directory is now at 1a739394e9d4 |
| 183 | 181 |
| 184 $ hg glog | 182 $ hg glog |
| 185 @ 5:1a739394e9d4 phase-divergent update to 580f2d01e52c: | 183 @ 5:1a739394e9d4 phase-divergent update to 580f2d01e52c: |
| 310 base: [2] added c | 308 base: [2] added c |
| 311 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b | 309 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
| 312 updating to "local" side of the conflict: c0d7ee6604ea | 310 updating to "local" side of the conflict: c0d7ee6604ea |
| 313 merging "other" content-divergent changeset 'c3d442d80993' | 311 merging "other" content-divergent changeset 'c3d442d80993' |
| 314 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 312 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 315 computing new diff | |
| 316 committed as 3b336cbee992 | 313 committed as 3b336cbee992 |
| 317 working directory is now at 3b336cbee992 | 314 working directory is now at 3b336cbee992 |
| 318 | 315 |
| 319 $ hg glog -p | 316 $ hg glog -p |
| 320 @ 8:3b336cbee992 phase-divergent update to c0d7ee6604ea: | 317 @ 8:3b336cbee992 phase-divergent update to c0d7ee6604ea: |
| 444 base: [3] added d | 441 base: [3] added d |
| 445 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be | 442 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
| 446 updating to "local" side of the conflict: 93cd84bbdaca | 443 updating to "local" side of the conflict: 93cd84bbdaca |
| 447 merging "other" content-divergent changeset 'f88581407163' | 444 merging "other" content-divergent changeset 'f88581407163' |
| 448 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 445 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 449 computing new diff | |
| 450 committed as 4cbe48a0c3d9 | 446 committed as 4cbe48a0c3d9 |
| 451 working directory is now at 4cbe48a0c3d9 | 447 working directory is now at 4cbe48a0c3d9 |
| 452 | 448 |
| 453 $ hg glog -l 1 | 449 $ hg glog -l 1 |
| 454 @ 8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca: | 450 @ 8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca: |
| 561 $ hg evolve --continue | 557 $ hg evolve --continue |
| 562 evolving 4:e568fd1029bb "added c e" | 558 evolving 4:e568fd1029bb "added c e" |
| 563 updating to "local" side of the conflict: 93cd84bbdaca | 559 updating to "local" side of the conflict: 93cd84bbdaca |
| 564 merging "other" content-divergent changeset '2af3359250d3' | 560 merging "other" content-divergent changeset '2af3359250d3' |
| 565 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 561 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 566 computing new diff | |
| 567 committed as 06e4564a3897 | 562 committed as 06e4564a3897 |
| 568 working directory is now at 06e4564a3897 | 563 working directory is now at 06e4564a3897 |
| 569 | 564 |
| 570 $ hg evolve -l | 565 $ hg evolve -l |
| 571 $ cd .. | 566 $ cd .. |
| 655 $ hg res -m | 650 $ hg res -m |
| 656 (no more unresolved files) | 651 (no more unresolved files) |
| 657 continue: hg evolve --continue | 652 continue: hg evolve --continue |
| 658 | 653 |
| 659 $ hg evolve --continue | 654 $ hg evolve --continue |
| 660 computing new diff | |
| 661 committed as 2a0f44767904 | 655 committed as 2a0f44767904 |
| 662 working directory is now at 2a0f44767904 | 656 working directory is now at 2a0f44767904 |
| 663 | 657 |
| 664 $ hg evolve -l | 658 $ hg evolve -l |
| 665 $ cd .. | 659 $ cd .. |
| 784 $ hg res -m | 778 $ hg res -m |
| 785 (no more unresolved files) | 779 (no more unresolved files) |
| 786 continue: hg evolve --continue | 780 continue: hg evolve --continue |
| 787 | 781 |
| 788 $ hg evolve --continue | 782 $ hg evolve --continue |
| 789 computing new diff | |
| 790 committed as b9082a9e66ce | 783 committed as b9082a9e66ce |
| 791 working directory is now at b9082a9e66ce | 784 working directory is now at b9082a9e66ce |
| 792 | 785 |
| 793 $ hg evolve -l | 786 $ hg evolve -l |
| 794 $ cd .. | 787 $ cd .. |