Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | 629558d09898 |
| children | 5940e586efd9 ef22eef37ecc |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 113 $ hg pull ../public | 113 $ hg pull ../public |
| 114 pulling from ../public | 114 pulling from ../public |
| 115 searching for changes | 115 searching for changes |
| 116 no changes found | 116 no changes found |
| 117 1 new phase-divergent changesets | 117 1 new phase-divergent changesets |
| 118 1 local changesets published | |
| 118 | 119 |
| 119 $ hg glog | 120 $ hg glog |
| 120 @ 2:98bb3a6cfe1a tweak a | 121 @ 2:98bb3a6cfe1a tweak a |
| 121 | () draft | 122 | () draft |
| 122 | o 1:4d1169d82e47 modify a | 123 | o 1:4d1169d82e47 modify a |
| 281 $ hg pull ../public | 282 $ hg pull ../public |
| 282 pulling from ../public | 283 pulling from ../public |
| 283 searching for changes | 284 searching for changes |
| 284 no changes found | 285 no changes found |
| 285 1 new phase-divergent changesets | 286 1 new phase-divergent changesets |
| 287 1 local changesets published | |
| 286 | 288 |
| 287 $ hg glog | 289 $ hg glog |
| 288 @ 4:d47f2b37ed82 added bar to foo | 290 @ 4:d47f2b37ed82 added bar to foo |
| 289 | (bm) draft | 291 | (bm) draft |
| 290 | o 3:aa071e5554e3 added foo to foo | 292 | o 3:aa071e5554e3 added foo to foo |
| 411 adding changesets | 413 adding changesets |
| 412 adding manifests | 414 adding manifests |
| 413 adding file changes | 415 adding file changes |
| 414 added 1 changesets with 1 changes to 1 files | 416 added 1 changesets with 1 changes to 1 files |
| 415 new changesets b756eb10ea73 | 417 new changesets b756eb10ea73 |
| 418 1 local changesets published | |
| 416 (run 'hg update' to get a working copy) | 419 (run 'hg update' to get a working copy) |
| 417 | 420 |
| 418 $ hg push ../public | 421 $ hg push ../public |
| 419 pushing to ../public | 422 pushing to ../public |
| 420 searching for changes | 423 searching for changes |
| 432 $ hg pull ../public | 435 $ hg pull ../public |
| 433 pulling from ../public | 436 pulling from ../public |
| 434 searching for changes | 437 searching for changes |
| 435 no changes found | 438 no changes found |
| 436 1 new phase-divergent changesets | 439 1 new phase-divergent changesets |
| 440 1 local changesets published | |
| 437 | 441 |
| 438 $ hg glog | 442 $ hg glog |
| 439 @ 7:2c3560aedead foo to bar | 443 @ 7:2c3560aedead foo to bar |
| 440 | (bm) draft | 444 | (bm) draft |
| 441 | o 6:b756eb10ea73 added bar to bar | 445 | o 6:b756eb10ea73 added bar to bar |
| 561 $ hg pull ../public | 565 $ hg pull ../public |
| 562 pulling from ../public | 566 pulling from ../public |
| 563 searching for changes | 567 searching for changes |
| 564 no changes found | 568 no changes found |
| 565 1 new phase-divergent changesets | 569 1 new phase-divergent changesets |
| 570 1 local changesets published | |
| 566 | 571 |
| 567 $ hg obslog -r . | 572 $ hg obslog -r . |
| 568 @ 334e300d6db5 (10) added x to x | 573 @ 334e300d6db5 (10) added x to x |
| 569 | | 574 | |
| 570 o 2352021b3785 (9) added x to x | 575 o 2352021b3785 (9) added x to x |
| 785 recreate:[19] added l to l | 790 recreate:[19] added l to l |
| 786 atop:[17] added l to l | 791 atop:[17] added l to l |
| 787 rebasing to destination parent: 8c2bb6fb44e9 | 792 rebasing to destination parent: 8c2bb6fb44e9 |
| 788 merging x | 793 merging x |
| 789 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') | 794 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
| 790 evolution failed! | 795 fix conflicts and see `hg help evolve.interrupted` |
| 791 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` | 796 [1] |
| 792 abort: unresolved merge conflicts (see hg help resolve) | |
| 793 [255] | |
| 794 | 797 |
| 795 $ hg diff | 798 $ hg diff |
| 796 diff -r 8c2bb6fb44e9 l | 799 diff -r 8c2bb6fb44e9 l |
| 797 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 800 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 798 +++ b/l Thu Jan 01 00:00:00 1970 +0000 | 801 +++ b/l Thu Jan 01 00:00:00 1970 +0000 |