D10059: test-copies: introduce merge chains test for the P/Q merges

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is similar to the chaining test we have for the A/E merges. The current result of this tests is wrong, as for the other test of the same familly.

D10058: test-copies: add a case involving the `b` and a new `r` branch

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY 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

D10057: test-copies: introduce case combining the `p` and `q` branch

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY That case involves conflicting copies information from each branch. It is similar to the `mAEm` / `mEAm` case except this case actual content merge is

D10056: test-copies: add a `q` branch similar to the `e` but on the new files

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This branch will be used to create merge case that mirror ones involving the `e` branch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D10055: test-copies: add a `p` branch similar to the `a` but on the new files

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This branch will be used to create merge case that mirror ones involving the `a` branch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D10054: test-copies: move the new files in the `i` branch

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY 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

D10053: test-copies: add 3 new files with their own content

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY 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

D10052: test-copies: introduce merge chaing test for the A/E + change tests

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY 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

D10051: test-copies: add a "change during merge" variant to the A+E test

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Checks inline comment for details. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10051 AFFECTED FILES

D10050: test-copies: filter out the linkrev part of `debugindex`

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It is not really useful for the tests and is a large source of churn when adding more revisions to the tests. REPOSITORY rHG Mercurial BRANCH default

D10049: test-copies: use "case-id" instead of revision number when listing sidedata

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The revision number are not very informative and can change when new changeset are added, creating unnecessary churn. We change the template before adding

D10048: test-copies: remove revision number from log

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10048 AFFECTED FILES tests/test-copies-chain-merge.t CHANGE DETAILS diff --git

D10047: test-copies: add subcase titles for various "conflicting" information variant

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This make the transitions between case clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10047 AFFECTED

D10046: test-copies: improve description of the B+F case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10046 AFFECTED FILES

D10045: test-copies: improve description of the C+H case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10045 AFFECTED FILES

D10044: test-copies: improve description of the B+C "revert/restore" case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10044 AFFECTED FILES

D10043: test-copies: improve description of the G+C case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10043 AFFECTED FILES

D10042: test-copies: improve description of the G+F case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10042 AFFECTED FILES

D10041: test-copies: improve description of the D+G case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10041 AFFECTED FILES

D10040: test-copies: improve description of the A+E case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10040 AFFECTED FILES

D10039: test-copies: improve description of the B+D case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10039 AFFECTED FILES

D10035: test-copies: don't use empty file for "same content" cases

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY For main case (using filelog or sidedata), this lead to the following hash change. Changesets: - 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 →

D10038: test-copies: improve description of the B+C case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10038 AFFECTED FILES

D10037: test-copies: improve description of the A+B case

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make its role clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10037 AFFECTED FILES

D10036: test-copies: use intermediate variable some commit descriptions

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Right now, everything mostly says "simple merge", we want to use something a bit more descriptive. Before doing any changes, we do most of the churn. This