Mercurial > evolve
changeset 6184:b8a1743e7ff9 mercurial-5.3
test-compat: merge mercurial-5.4 into mercurial-5.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:57:39 +0300 |
| parents | 9cb94967890b (current diff) d76fefa7355a (diff) |
| children | 74a61e0dc9da 8643272ade4c |
| files | .gitlab-ci.yml tests/test-evolve-progress.t |
| diffstat | 10 files changed, 22 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Tue Feb 22 08:43:16 2022 +0300 +++ b/.gitlab-ci.yml Tue Feb 22 08:57:39 2022 +0300 @@ -44,7 +44,7 @@ tests-py2-cext: <<: *runtests variables: - RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" + RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py2-pure: @@ -58,7 +58,7 @@ variables: PY: py3 PYTHON: python3 - RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" + RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py3-pure:
--- a/tests/test-discovery-obshashrange.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-discovery-obshashrange.t Tue Feb 22 08:57:39 2022 +0300 @@ -305,7 +305,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob)
--- a/tests/test-evolve-abort-orphan.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-evolve-abort-orphan.t Tue Feb 22 08:57:39 2022 +0300 @@ -203,7 +203,7 @@ | () draft | * 6:e83de241f751 added d | | () draft orphan - | % 5:e93a9161a274 added c + | * 5:e93a9161a274 added c | | () draft orphan | x 2:b1661037fa25 added b | | () draft @@ -297,7 +297,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | | * 5:bcb1c47f8520 added d | | | () draft orphan @@ -361,7 +361,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | | * 5:bcb1c47f8520 added d | | | () draft orphan @@ -446,7 +446,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | % 6:8f20d4390c21 foo to a + | * 6:8f20d4390c21 foo to a | | () draft orphan | x 1:2f913b0c9220 added a |/ () draft @@ -514,7 +514,7 @@ | (bm1) draft o 4:a0086c17bfc7 added a | () draft - | % 3:17509928e5bf added c + | * 3:17509928e5bf added c | | () draft orphan | x 2:9f0c80a55ddc added b | | () draft
--- a/tests/test-evolve-interrupted.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-evolve-interrupted.t Tue Feb 22 08:57:39 2022 +0300 @@ -52,7 +52,7 @@ $ hg l @ 2 apricot and blueberry - % 1 banana + * 1 banana | x 0 apricot @@ -80,7 +80,7 @@ $ hg l @ 2 apricot and blueberry - % 1 banana + * 1 banana | x 0 apricot
--- a/tests/test-evolve-phase.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-evolve-phase.t Tue Feb 22 08:57:39 2022 +0300 @@ -103,7 +103,7 @@ $ hg glog @ 3 - 87495ea7c9ec b (draft) | - | % 2 - 13833940840c c (secret) + | * 2 - 13833940840c c (secret) | | | x 1 - 1e6c11564562 b (draft) |/
--- a/tests/test-evolve-progress.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-evolve-progress.t Tue Feb 22 08:57:39 2022 +0300 @@ -33,7 +33,7 @@ ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 a: remote is newer -> g getting a - updating: a 1/2 files (50.00%) + updating: a 1/1 files (100.00%) committing files: a committing manifest @@ -42,6 +42,8 @@ move:[2] third hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) + unmatched files in other: + b resolving manifests branchmerge: True, force: True, partial: False ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 @@ -61,7 +63,7 @@ ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab b: remote is newer -> g getting b - updating: b 1/2 files (50.00%) + updating: b 1/1 files (100.00%) committing files: b committing manifest @@ -94,7 +96,7 @@ ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 a: remote is newer -> g getting a - updating: a 1/2 files (50.00%) + updating: a 1/1 files (100.00%) committing files: a committing manifest @@ -153,6 +155,8 @@ atop:[11] second hg rebase -r 53c0008d98a0 -d 60a86497fbfe evolve: 2/3 changesets (66.67%) + unmatched files in other: + b resolving manifests branchmerge: True, force: True, partial: False ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 @@ -171,7 +175,7 @@ ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 b: remote is newer -> g getting b - updating: b 1/2 files (50.00%) + updating: b 1/1 files (100.00%) committing files: b committing manifest
--- a/tests/test-evolve.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-evolve.t Tue Feb 22 08:57:39 2022 +0300 @@ -1403,7 +1403,7 @@ | o 32:6ec468e4cb98@default(draft) amended | - | % 31:5be050657ca5@default(draft) will cause conflict at evolve + | * 31:5be050657ca5@default(draft) will cause conflict at evolve | | | x 30:748126f98ff1@default(draft) will be evolved safely | |
--- a/tests/test-stabilize-conflict.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-stabilize-conflict.t Tue Feb 22 08:57:39 2022 +0300 @@ -139,7 +139,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | % changeset: 4:71c18f70c34f + | * changeset: 4:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan @@ -232,7 +232,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | % changeset: 6:1836b91c6c1d + | * changeset: 6:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan
--- a/tests/test-topic-stack.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-topic-stack.t Tue Feb 22 08:57:39 2022 +0300 @@ -385,14 +385,6 @@ hg: parse error: stack takes no arguments, it works on current topic [255] -Stack relation: - - $ hg log -r 'foo#stack' - 2 default {foo} draft c_c - 4 default {foo} draft c_e - 5 default {foo} draft c_f - 6 default {foo} draft c_d - Stack relation subscript: $ hg log -r 'foo#stack[0]'
--- a/tests/test-topic.t Tue Feb 22 08:43:16 2022 +0300 +++ b/tests/test-topic.t Tue Feb 22 08:57:39 2022 +0300 @@ -953,10 +953,6 @@ ^ 3 s1: 0 - $ tlog 'tip#s' - 0: - 4: - $ tlog 'tip#stack[0]' $ tlog 'tip#stack[1]' 0: @@ -975,11 +971,6 @@ s1: 1 s0^ 0 (base) - $ tlog 'featureA#s' - 1: featureA - 2: featureA - 3: featureA - $ tlog 'featureA#s[0]' 0: $ tlog 'featureA#s[0:0]' @@ -1030,7 +1021,6 @@ ### target: default (branch) (stack is empty) s0^ 4 (base current) - $ tlog 'wdir()#s' $ tlog 'wdir()#s[0]' 4: