Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | 03410b04cf10 |
| children | 82da27321e91 43c4db536990 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 576 Alice like always dont care about Bob existence and rebases her changeset and | 576 Alice like always dont care about Bob existence and rebases her changeset and |
| 577 then pull from public repo creating phase divergence | 577 then pull from public repo creating phase divergence |
| 578 | 578 |
| 579 $ cd ../alice | 579 $ cd ../alice |
| 580 $ hg rebase -r . -d .^^^ | 580 $ hg rebase -r . -d .^^^ |
| 581 rebasing 9:2352021b3785 bm tip "added x to x" | 581 rebasing 9:2352021b3785 "added x to x" (bm tip) |
| 582 | 582 |
| 583 $ hg pull ../public | 583 $ hg pull ../public |
| 584 pulling from ../public | 584 pulling from ../public |
| 585 searching for changes | 585 searching for changes |
| 586 no changes found | 586 no changes found |
| 705 $ echo y > y | 705 $ echo y > y |
| 706 $ echo foobar >> foo | 706 $ echo foobar >> foo |
| 707 $ hg add y | 707 $ hg add y |
| 708 $ hg ci -m "y to y and foobar to foo" | 708 $ hg ci -m "y to y and foobar to foo" |
| 709 $ hg rebase -r . -d .^^^ | 709 $ hg rebase -r . -d .^^^ |
| 710 rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo" | 710 rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) |
| 711 | 711 |
| 712 $ echo foo > y | 712 $ echo foo > y |
| 713 $ hg amend | 713 $ hg amend |
| 714 | 714 |
| 715 Alice making the old changeset public to have content-divergence | 715 Alice making the old changeset public to have content-divergence |
| 812 conflicts while rebasing on parent | 812 conflicts while rebasing on parent |
| 813 | 813 |
| 814 $ echo l > l | 814 $ echo l > l |
| 815 $ hg ci -Aqm "added l to l" | 815 $ hg ci -Aqm "added l to l" |
| 816 $ hg rebase -r . -d .^^^^ | 816 $ hg rebase -r . -d .^^^^ |
| 817 rebasing 17:f3794e5a91dc tip "added l to l" | 817 rebasing 17:f3794e5a91dc "added l to l" (tip) |
| 818 $ echo kl > l | 818 $ echo kl > l |
| 819 $ echo foo > x | 819 $ echo foo > x |
| 820 $ hg add x | 820 $ hg add x |
| 821 $ hg amend | 821 $ hg amend |
| 822 | 822 |
| 858 rebasing to destination parent: 8c2bb6fb44e9 | 858 rebasing to destination parent: 8c2bb6fb44e9 |
| 859 merging x | 859 merging x |
| 860 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') | 860 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
| 861 unresolved merge conflicts | 861 unresolved merge conflicts |
| 862 (see 'hg help evolve.interrupted') | 862 (see 'hg help evolve.interrupted') |
| 863 [240] | 863 [1] |
| 864 | 864 |
| 865 $ hg diff | 865 $ hg diff |
| 866 diff -r 8c2bb6fb44e9 l | 866 diff -r 8c2bb6fb44e9 l |
| 867 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 867 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 868 +++ b/l Thu Jan 01 00:00:00 1970 +0000 | 868 +++ b/l Thu Jan 01 00:00:00 1970 +0000 |