Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 22 Feb 2021 11:56:58 +0100] rev 46560
test-copies: add a case involving the `b` and a new `r` branch
That case involve a branch overwriting copies information from the other one.
It is similar to the `mBFm` / `mFBm` case except this case actual content merge
is involved too.
Differential Revision: https://phab.mercurial-scm.org/D10058
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 20:46:33 +0100] rev 46559
test-copies: introduce case combining the `p` and `q` branch
That case involves conflicting copies information from each branch. It is
similar to the `mAEm` / `mEAm` case except this case actual content merge is
involved too.
Differential Revision: https://phab.mercurial-scm.org/D10057
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 20:47:15 +0100] rev 46558
test-copies: add a `q` branch similar to the `e` but on the new files
This branch will be used to create merge case that mirror ones involving the `e` branch.
Differential Revision: https://phab.mercurial-scm.org/D10056
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 20:47:07 +0100] rev 46557
test-copies: add a `p` branch similar to the `a` but on the new files
This branch will be used to create merge case that mirror ones involving the `a` branch.
Differential Revision: https://phab.mercurial-scm.org/D10055
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 18:57:09 +0100] rev 46556
test-copies: move the new files in the `i` branch
The initial branch is moving some of the "same content" file around. We do the
same for the "different content" before start to implement more tests.
The new files have harmless impact of various existing tests.
Differential Revision: https://phab.mercurial-scm.org/D10054
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 17:06:12 +0100] rev 46555
test-copies: add 3 new files with their own content
The new `p`, `q` and `r` file mirror the `a`, `b` and `h` but with different
content for each files. This will be used to create "mirror" test case that
involve actual merge happening.
For now, we only add the file to keep patches small and easier to review.
Differential Revision: https://phab.mercurial-scm.org/D10053
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 19 Feb 2021 16:37:55 +0100] rev 46554
test-copies: introduce merge chaing test for the A/E + change tests
This is similar to the chaining test we have for the A/E merges (without change).
The current result of this tests is wrong, as for they "without change counter
part". This will be fixed by a later changesets.
Differential Revision: https://phab.mercurial-scm.org/D10052