martinvonz 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/D10065 AFFECTED FILES tests/test-copies-chain-merge.t CHANGE DETAILS diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -78,7 +78,7 @@ $ echo "original content for P" > p $ echo "original content for Q" > q $ echo "original content for R" > r - $ hg ci -Am 'i-0 initial commit: a b h' + $ hg ci -Am 'i-0 initial commit: a b h p q r' adding a adding b adding h @@ -96,7 +96,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r And having another branch with renames on the other side @@ -114,7 +114,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Have a branching with nothing on one side @@ -131,7 +131,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Create a branch that delete a file previous renamed @@ -148,7 +148,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Create a branch that delete a file previous renamed and recreate it @@ -170,7 +170,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Having another branch renaming a different file to the same filename as another @@ -191,7 +191,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg up -q null @@ -213,7 +213,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg up -q null @@ -235,7 +235,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg up -q null @@ -281,7 +281,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -331,7 +331,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Comparing with a merge re-adding the file afterward @@ -371,7 +371,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -419,7 +419,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: new copy information on both side with an actual merge happening @@ -462,7 +462,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: existing copy information overwritten on one branch @@ -518,7 +518,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: existing copy information overwritten on one branch, with different content) @@ -572,7 +572,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -623,7 +623,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: merging a change to a file with a "copy overwrite" to that file from another branch @@ -678,7 +678,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -736,7 +736,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -785,7 +785,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -834,7 +834,7 @@ | | o | i-1: a -move-> c, p -move-> s |/ - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Variant of previous with extra changes introduced by the merge @@ -888,7 +888,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Decision from previous merge are properly chained with later merge @@ -995,7 +995,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: chaining conflicting rename resolution, with actual merging happening @@ -1094,7 +1094,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: chaining salvage information during a merge @@ -1177,7 +1177,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r @@ -1273,7 +1273,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Subcase: chaining conflicting rename resolution, with extra change during the merge @@ -1356,7 +1356,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Summary of all created cases @@ -1379,7 +1379,7 @@ f-2: rename i -> d g-1: update d h-1: b -(move)-> d - i-0 initial commit: a b h + i-0 initial commit: a b h p q r i-1: a -move-> c, p -move-> s i-2: c -move-> d, s -move-> t j-1: unrelated changes (based on the "a" series of changes) @@ -1919,7 +1919,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' @@ -1986,7 +1986,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r - comparing from the merge @@ -2072,7 +2072,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' M d @@ -2163,7 +2163,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #if no-changeset $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' @@ -2294,7 +2294,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' M b @@ -2343,7 +2343,7 @@ | o f-1: rename h -> i : - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2359,7 +2359,7 @@ | o f-1: rename h -> i : - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2392,7 +2392,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")' M b @@ -2441,7 +2441,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2457,7 +2457,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2492,7 +2492,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r One side of the merge have a long history with rename. The other side of the merge point to a new file with a smaller history. Each side is "valid". @@ -2535,7 +2535,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2564,7 +2564,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2606,7 +2606,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r Note: @@ -2688,7 +2688,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2714,7 +2714,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #else BROKEN: `hg log --follow <file>` relies on filelog metadata to work @@ -2750,7 +2750,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #if no-changeset @@ -2879,7 +2879,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r 'a' is the copy source of 'd' @@ -2930,7 +2930,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r 'a' is the the copy source of 'd' @@ -2982,7 +2982,7 @@ | | o | i-1: a -move-> c, p -move-> s |/ - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' @@ -3049,7 +3049,7 @@ | o i-1: a -move-> c, p -move-> s | - o i-0 initial commit: a b h + o i-0 initial commit: a b h p q r #if no-changeset $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
