Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 6065:c0921b5277a0 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:32:36 +0300 |
| parents | 43c4db536990 b1a2cfde69d3 |
| children | 55e9987b8384 e6ae5af97683 |
comparison
equal
deleted
inserted
replaced
| 6064:28a77df6e41f | 6065:c0921b5277a0 |
|---|---|
| 573 Alice like always dont care about Bob existence and rebases her changeset and | 573 Alice like always dont care about Bob existence and rebases her changeset and |
| 574 then pull from public repo creating phase divergence | 574 then pull from public repo creating phase divergence |
| 575 | 575 |
| 576 $ cd ../alice | 576 $ cd ../alice |
| 577 $ hg rebase -r . -d .^^^ | 577 $ hg rebase -r . -d .^^^ |
| 578 rebasing 9:2352021b3785 bm tip "added x to x" | 578 rebasing 9:2352021b3785 "added x to x" (bm tip) |
| 579 | 579 |
| 580 $ hg pull ../public | 580 $ hg pull ../public |
| 581 pulling from ../public | 581 pulling from ../public |
| 582 searching for changes | 582 searching for changes |
| 583 no changes found | 583 no changes found |
| 702 $ echo y > y | 702 $ echo y > y |
| 703 $ echo foobar >> foo | 703 $ echo foobar >> foo |
| 704 $ hg add y | 704 $ hg add y |
| 705 $ hg ci -m "y to y and foobar to foo" | 705 $ hg ci -m "y to y and foobar to foo" |
| 706 $ hg rebase -r . -d .^^^ | 706 $ hg rebase -r . -d .^^^ |
| 707 rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo" | 707 rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) |
| 708 | 708 |
| 709 $ echo foo > y | 709 $ echo foo > y |
| 710 $ hg amend | 710 $ hg amend |
| 711 | 711 |
| 712 Alice making the old changeset public to have content-divergence | 712 Alice making the old changeset public to have content-divergence |
| 809 conflicts while rebasing on parent | 809 conflicts while rebasing on parent |
| 810 | 810 |
| 811 $ echo l > l | 811 $ echo l > l |
| 812 $ hg ci -Aqm "added l to l" | 812 $ hg ci -Aqm "added l to l" |
| 813 $ hg rebase -r . -d .^^^^ | 813 $ hg rebase -r . -d .^^^^ |
| 814 rebasing 17:f3794e5a91dc tip "added l to l" | 814 rebasing 17:f3794e5a91dc "added l to l" (tip) |
| 815 $ echo kl > l | 815 $ echo kl > l |
| 816 $ echo foo > x | 816 $ echo foo > x |
| 817 $ hg add x | 817 $ hg add x |
| 818 $ hg amend | 818 $ hg amend |
| 819 | 819 |
| 855 rebasing to destination parent: 8c2bb6fb44e9 | 855 rebasing to destination parent: 8c2bb6fb44e9 |
| 856 merging x | 856 merging x |
| 857 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') | 857 warning: conflicts while merging x! (edit, then use 'hg resolve --mark') |
| 858 unresolved merge conflicts | 858 unresolved merge conflicts |
| 859 (see 'hg help evolve.interrupted') | 859 (see 'hg help evolve.interrupted') |
| 860 [240] | 860 [1] |
| 861 | 861 |
| 862 $ hg diff | 862 $ hg diff |
| 863 diff -r 8c2bb6fb44e9 l | 863 diff -r 8c2bb6fb44e9 l |
| 864 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 864 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 865 +++ b/l Thu Jan 01 00:00:00 1970 +0000 | 865 +++ b/l Thu Jan 01 00:00:00 1970 +0000 |