Mercurial > hg-stable
changeset 44475:902b559202a6
copies-tests: add a `h` to the root commit (for chain merge tests)
This will be useful for incoming new test cases. We need a new file to rename
around.
Differential Revision: https://phab.mercurial-scm.org/D8239
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 29 Feb 2020 19:50:05 +0100 |
| parents | 7f5735639360 |
| children | 890def17d03b |
| files | tests/test-copies-chain-merge.t |
| diffstat | 1 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copies-chain-merge.t Sat Mar 07 00:03:41 2020 +0100 +++ b/tests/test-copies-chain-merge.t Sat Feb 29 19:50:05 2020 +0100 @@ -23,10 +23,11 @@ Add some linear rename initialy - $ touch a b - $ hg ci -Am 'i-0 initial commit: a b' + $ touch a b h + $ hg ci -Am 'i-0 initial commit: a b h' adding a adding b + adding h $ hg mv a c $ hg ci -Am 'i-1: a -move-> c' $ hg mv c d @@ -36,7 +37,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] And having another branch with renames on the other side @@ -54,7 +55,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Have a branching with nothing on one side @@ -71,7 +72,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] @@ -107,7 +108,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Create a branch that delete a file previous renamed @@ -124,7 +125,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Merge: @@ -168,7 +169,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Create a branch that delete a file previous renamed and recreate it @@ -190,7 +191,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Merge: @@ -232,7 +233,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Having another branch renaming a different file to the same filename as another @@ -253,7 +254,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Merge: @@ -290,7 +291,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] Note: @@ -459,7 +460,7 @@ | o 1 i-1: a -move-> c] | - o 0 i-0 initial commit: a b] + o 0 i-0 initial commit: a b h] This `hg log` output is correct