# HG changeset patch # User Anton Shestakov # Date 1719401976 -14400 # Node ID e51dfd0e1a882ec7c942e85d695927b6392cc7bb # Parent 241c4fec9723850d0a47a8bf3e2b686c03ba6d50# Parent de34d08d9422c2adbfd5444347709a576daebbcc test-compat: merge mercurial-6.1 into mercurial-6.0 diff -r 241c4fec9723 -r e51dfd0e1a88 .gitlab-ci.yml diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-amend.t --- a/tests/test-amend.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-amend.t Wed Jun 26 15:39:36 2024 +0400 @@ -218,7 +218,6 @@ $ echo edited_a > a $ hg ci -m "edited a" 1 new orphan changesets - created new head $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) 1 new obsolescence markers 2 new content-divergent changesets diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-discovery-obshashrange.t Wed Jun 26 15:39:36 2024 +0400 @@ -307,10 +307,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%2C03%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) (no-zstd default-cg3 !) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%2C03%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlog-compression-zstd,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) (zstd default-cg3 !) - * @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%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) (no-zstd no-default-cg3 !) - * @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%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlog-compression-zstd,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) (zstd no-default-cg3 !) + * @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%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) diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-content-divergent-corner-cases.t --- a/tests/test-evolve-content-divergent-corner-cases.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-content-divergent-corner-cases.t Wed Jun 26 15:39:36 2024 +0400 @@ -375,7 +375,7 @@ with: [6] updated e base: [4] added e rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a - file 'd' was deleted in local [local] but was modified in other [other]. + file 'd' was deleted in local but was modified in other. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-content-divergent-interrupted.t --- a/tests/test-evolve-content-divergent-interrupted.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-content-divergent-interrupted.t Wed Jun 26 15:39:36 2024 +0400 @@ -383,8 +383,8 @@ $ hg evolve -c evolving 8:a8673909e314 "added d" merging a + merging d warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 2 files unresolved unresolved merge conflicts diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-content-divergent-user-independent-resolution.t --- a/tests/test-evolve-content-divergent-user-independent-resolution.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-content-divergent-user-independent-resolution.t Wed Jun 26 15:39:36 2024 +0400 @@ -35,7 +35,7 @@ $ hg push -q $ cd ../local - $ hg push --force -q + $ hg push -q 2 new content-divergent changesets $ hg pull -q 2 new content-divergent changesets diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-obshistory.t Wed Jun 26 15:39:36 2024 +0400 @@ -151,7 +151,7 @@ 2 new obsolescence markers obsoleted 1 changesets new changesets 7a230b46bf61 (1 drafts) - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61) Check that obslog works with markers pointing to missing local changectx diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-progress.t --- a/tests/test-evolve-progress.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-progress.t Wed Jun 26 15:39:36 2024 +0400 @@ -101,8 +101,6 @@ committing changelog updating the branch cache obscache is out of date - invalid branch cache (served): tip differs - invalid branch cache (served.hidden): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b @@ -126,11 +124,15 @@ ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 starting 4 threads for background file closing (?) preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) updating: a 1/1 files (100.00%) picked tool ':merge' for a (binary False symlink False changedelete False) merging a my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b + a: versions differ -> m (merge) + updating: a 2/2 files (100.00%) + picked tool ':merge' for a (binary False symlink False changedelete False) + my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') @@ -177,7 +179,6 @@ updating the branch cache obscache is out of date invalid branch cache (served): tip differs - invalid branch cache (served.hidden): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: 1edc3bac9e3c, local: 1edc3bac9e3c+, remote: f8d7d38c0a88 diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-public-content-divergent-corner-cases.t --- a/tests/test-evolve-public-content-divergent-corner-cases.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Wed Jun 26 15:39:36 2024 +0400 @@ -421,7 +421,7 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" - file 'd' was deleted in other [other] but was modified in local [local]. + file 'd' was deleted in other but was modified in local. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-evolve-templates.t --- a/tests/test-evolve-templates.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-evolve-templates.t Wed Jun 26 15:39:36 2024 +0400 @@ -1080,7 +1080,7 @@ 2 new obsolescence markers obsoleted 1 changesets new changesets 7a230b46bf61 (1 drafts) - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61) $ hg log --hidden -G diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-fold.t --- a/tests/test-fold.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-fold.t Wed Jun 26 15:39:36 2024 +0400 @@ -146,7 +146,7 @@ $ hg fold --from 6 # want to run hg fold 6 abort: hidden revision '6' was rewritten as: 198b5c405d01 (use --hidden to access hidden revisions) - [10] + [255] $ hg log -G @ 11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1 diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-obsolete.t --- a/tests/test-obsolete.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-obsolete.t Wed Jun 26 15:39:36 2024 +0400 @@ -134,7 +134,6 @@ (use 'hg evolve' to update to its successor: 725c380fe99b) $ mkcommit d # 5 (on 3) 1 new orphan changesets - created new head $ qlog -r 'obsolete()' 3 - 0d3f46688ccc diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-sharing.t --- a/tests/test-sharing.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-sharing.t Wed Jun 26 15:39:36 2024 +0400 @@ -104,6 +104,8 @@ obsoleted 1 changesets new changesets 522d503432a2 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "522d503432a2: fix bug 37" + 1 other heads for branch "default" Figure SG03 $ hg -R ../dev-repo shortlog --hidden -G @@ -136,6 +138,8 @@ $ cd ../test-repo $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "7b49f864d655: fix bug 37" + 1 other heads for branch "default" $ hg shortlog --hidden -G @ 4:7b49 draft fix bug 37 | diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-topic-push.t --- a/tests/test-topic-push.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-topic-push.t Wed Jun 26 15:39:36 2024 +0400 @@ -211,10 +211,10 @@ $ hg outgoing draft --topic nonexistent abort: topic 'nonexistent' does not exist - [10] + [255] $ hg push draft --topic nonexistent abort: topic 'nonexistent' does not exist - [10] + [255] $ hg up babar switching to topic babar diff -r 241c4fec9723 -r e51dfd0e1a88 tests/test-topic.t --- a/tests/test-topic.t Wed Jun 26 15:19:21 2024 +0400 +++ b/tests/test-topic.t Wed Jun 26 15:39:36 2024 +0400 @@ -671,7 +671,7 @@ $ hg pull ../pinky -r narf pulling from ../pinky abort: unknown revision 'narf' - [10] + [255] $ hg pull ../pinky -r default pulling from ../pinky searching for changes