Mercurial > evolve
changeset 4495:48e9169633ef
test: cleanup title and doc phase-divergent cases
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Apr 2019 20:18:14 +0200 |
| parents | 89efbe6bf920 |
| children | 02d3177085e1 |
| files | tests/test-evolve-phase-divergence.t |
| diffstat | 1 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Wed Apr 10 20:03:07 2019 +0200 +++ b/tests/test-evolve-phase-divergence.t Wed Apr 10 20:18:14 2019 +0200 @@ -54,6 +54,9 @@ $ cp -a private split-and-amend $ cp -a private merge-no-conflict +Simple phase-divergence case +============================ + Creating a phase-divergence changeset ------------------------------------- @@ -230,9 +233,11 @@ 2 new obsolescence markers [1] +phase-divergence that lead to new commit and bookmark movement +============================================================== + Creating more phase-divergence where a new resolution commit will be formed and also testing bookmark movement --------------------------------------------------------------------------------- Alice created a commit and push to private non-publishing repo @@ -390,11 +395,14 @@ added 1 changesets with 1 changes to 1 files 2 new obsolescence markers + +phase divergence rebasing back to old changeset - with (unrelated?) conflict +============================================================================ + Creating a phasedivergence changeset where the divergent changeset changed in a way that we rebase that on old public changeset, there will be conflicts, but the `hg evolve` command handles it very well and uses `hg revert` logic to prevent any conflicts -------------------------------------------------------------------------------- Alice creates one more changeset and pushes to private repo @@ -518,9 +526,11 @@ added 1 changesets with 1 changes to 1 files 2 new obsolescence markers +different parents for successors and predecessors +================================================= + Creating phase-divergence with divergent changeset and precursor having different parents ------------------------------------------------------------------------ Alice creates a changeset and pushes to private repo @@ -645,9 +655,11 @@ @@ -0,0 +1,1 @@ +x -Creating divergence with parent and content change both but not resulting in +divergence with parent+content change both, no conflict +======================================================= + +Creating divergence with parent cand content change both but not resulting in conflicts ------------------------------------------------------------------------------ Alice is tired of pushing and pulling and will create phase-divergence locally @@ -758,9 +770,11 @@ o 0:d3873e73d99e init () public +divergence with parent+content change both, with conflict +========================================================= + Creating divergence with parent and content change both which results in conflicts while rebasing on parent ------------------------------------------------------------------------------ $ echo l > l $ hg ci -Aqm "added l to l" @@ -1061,8 +1075,8 @@ @@ -1,1 +0,0 @@ -n -When the public changeset is split across various branches ----------------------------------------------------------- +When the public changeset is split across various topological branches +====================================================================== $ cd ../split-across-branches @@ -1189,7 +1203,7 @@ -q When the public changeset is split and amended --------------------------------------------------------------- +============================================== $ cd ../split-and-amend @@ -1333,7 +1347,7 @@ +n2 Testing the evolution of a phase-divergent merge with no conflicts ------------------------------------------------------------------- +================================================================== $ cd ../merge-no-conflict