Mercurial > evolve
changeset 5949:b399d9d24087 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 28 May 2021 00:28:25 +0800 |
| parents | 3641f0a2d1cc (diff) 5472f45017ce (current diff) |
| children | ee54e02d3ea0 |
| files | tests/test-discovery-obshashrange.t |
| diffstat | 30 files changed, 111 insertions(+), 121 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Fri May 28 00:23:12 2021 +0800 +++ b/.gitlab-ci.yml Fri May 28 00:28:25 2021 +0800 @@ -30,10 +30,7 @@ - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()') - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always $RUNTEST_ARGS) -checks-py2: - <<: *runtests - variables: - RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" +# There is no checks-py2 because Mercurial 4.6 lacks sparserevlog support tests-py2-cext: <<: *runtests
--- a/tests/test-amend.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-amend.t Fri May 28 00:28:25 2021 +0800 @@ -192,7 +192,7 @@ $ echo newchanges > a $ hg amend $ hg up 0 --hidden -q - updated to hidden changeset 9092f1db7931 + updating to a hidden changeset 9092f1db7931 (hidden revision '9092f1db7931' was rewritten as: aafaf407b00d) working directory parent is obsolete! (9092f1db7931)
--- a/tests/test-discovery-obshashrange.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-discovery-obshashrange.t Fri May 28 00:28:25 2021 +0800 @@ -214,6 +214,7 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files (+1 heads) + remote: 1 new obsolescence markers bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported @@ -221,7 +222,6 @@ preparing listkeys for "phases" sending listkeys command received listkey for "phases": 58 bytes - remote: 1 new obsolescence markers $ hg -R ../server blackbox * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)
--- a/tests/test-evolve-content-divergent-basic.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-basic.t Fri May 28 00:28:25 2021 +0800 @@ -198,9 +198,9 @@ changed branch on 1 changesets $ hg up c41c793e0ef1 --hidden + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: 9e5dffcb3d48) $ echo bar > d @@ -304,9 +304,9 @@ $ hg amend -m "foo to d" $ hg up 'predecessors(.)' --hidden + updating to a hidden changeset 34e78e1673c1 + (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 34e78e1673c1 - (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0) working directory parent is obsolete! (34e78e1673c1) (use 'hg evolve' to update to its successor: c9d0d72972b0) $ echo babar > d @@ -364,9 +364,9 @@ $ hg amend -m "bar to d, expect beers" $ hg up 'predecessors(.)' --hidden + updating to a hidden changeset cfd599de811a + (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset cfd599de811a - (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747) working directory parent is obsolete! (cfd599de811a) (use 'hg evolve' to update to its successor: ba0941ffb747) $ echo wat > d @@ -474,9 +474,9 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 'min(desc("More addition"))' + updating to a hidden changeset 867e43582046 + (hidden revision '867e43582046' was rewritten as: fc6349f931da) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 867e43582046 - (hidden revision '867e43582046' was rewritten as: fc6349f931da) working directory parent is obsolete! (867e43582046) (use 'hg evolve' to update to its successor: fc6349f931da) $ mv a a.old @@ -567,9 +567,9 @@ $ hg up --hidden 'min(desc("More addition"))' + updating to a hidden changeset 867e43582046 + (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 867e43582046 - (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68) working directory parent is obsolete! (867e43582046) (use 'hg evolve' to update to its successor: 6aa6f90a9f68) $ echo 'gotta break' >> a @@ -744,9 +744,9 @@ > EOF $ hg commit --amend -m E2 $ hg --hidden update -r 'desc(E1)' + updating to a hidden changeset 4a250e5bd992 + (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 4a250e5bd992 - (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) working directory parent is obsolete! (4a250e5bd992) (use 'hg evolve' to update to its successor: 084ae625fa51) $ cat << EOF > numbers
--- a/tests/test-evolve-content-divergent-corner-cases.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Fri May 28 00:28:25 2021 +0800 @@ -434,9 +434,9 @@ create some content divergence $ hg co dff6e52f5e41 --hidden + updating to a hidden changeset dff6e52f5e41 + (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset dff6e52f5e41 - (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) working directory parent is obsolete! (dff6e52f5e41) (use 'hg evolve' to update to its successor: 0825dcee2670) $ hg revert -r .^ c
--- a/tests/test-evolve-content-divergent-first-changeset.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-first-changeset.t Fri May 28 00:28:25 2021 +0800 @@ -24,7 +24,7 @@ 79fa0eb22d65 $ hg up be090ea66256 --hidden --quiet - updated to hidden changeset be090ea66256 + updating to a hidden changeset be090ea66256 (hidden revision 'be090ea66256' was rewritten as: 79fa0eb22d65) working directory parent is obsolete! (be090ea66256) $ echo a >> test
--- a/tests/test-evolve-content-divergent-interrupted.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-interrupted.t Fri May 28 00:28:25 2021 +0800 @@ -56,9 +56,9 @@ $ hg amend $ hg up c41c793e0ef1 --hidden + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: e49523854bc8) @@ -285,9 +285,9 @@ $ hg amend $ hg up --hidden 'min(desc("added d"))' + updating to a hidden changeset f8b09dd867e5 + (hidden revision 'f8b09dd867e5' was rewritten as: 6f7eaf1944c0) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset f8b09dd867e5 - (hidden revision 'f8b09dd867e5' was rewritten as: 6f7eaf1944c0) working directory parent is obsolete! (f8b09dd867e5) (use 'hg evolve' to update to its successor: 6f7eaf1944c0) $ echo bar > d @@ -447,9 +447,9 @@ $ hg amend $ hg up 'min(desc("added d"))' --hidden + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: e49523854bc8)
--- a/tests/test-evolve-content-divergent-meta.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-meta.t Fri May 28 00:28:25 2021 +0800 @@ -115,7 +115,7 @@ $ hg amend -m "updated c" $ hg up -r 'desc("added c")' --hidden -q - updated to hidden changeset 2b3c31fe982d + updating to a hidden changeset 2b3c31fe982d (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) working directory parent is obsolete! (2b3c31fe982d) $ echo coco > c
--- a/tests/test-evolve-content-divergent-relocation.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-relocation.t Fri May 28 00:28:25 2021 +0800 @@ -14,7 +14,6 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH - Testing resolution of content-divergent changesets when they are on different parents and resolution and relocation wont result in conflicts ------------------------------------------------------------------------------ @@ -185,9 +184,9 @@ $ hg amend -m "added foo to x" $ hg up 'predecessors(.)' --hidden + updating to a hidden changeset f220d694b3a6 + (hidden revision 'f220d694b3a6' was rewritten as: 91939f44a1fe) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset f220d694b3a6 - (hidden revision 'f220d694b3a6' was rewritten as: 91939f44a1fe) working directory parent is obsolete! (f220d694b3a6) (use 'hg evolve' to update to its successor: 91939f44a1fe) $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True @@ -298,9 +297,9 @@ $ hg amend $ hg up 'predecessors(.)' --hidden + updating to a hidden changeset d84c9e99d55b + (hidden revision 'd84c9e99d55b' was rewritten as: 98cd38d20303) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset d84c9e99d55b - (hidden revision 'd84c9e99d55b' was rewritten as: 98cd38d20303) working directory parent is obsolete! (d84c9e99d55b) (use 'hg evolve' to update to its successor: 98cd38d20303) $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True @@ -451,9 +450,9 @@ $ hg amend $ hg up 'predecessors(.)' --hidden + updating to a hidden changeset 136e58088ce2 + (hidden revision '136e58088ce2' was rewritten as: f4c3594c72e7) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 136e58088ce2 - (hidden revision '136e58088ce2' was rewritten as: f4c3594c72e7) working directory parent is obsolete! (136e58088ce2) (use 'hg evolve' to update to its successor: f4c3594c72e7) $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True @@ -656,7 +655,7 @@ $ hg rebase -r . -d 'desc("upstream")' rebasing 2:898ddd4443b3 "divergent" (tip) $ hg --hidden co 2 -q - updated to hidden changeset 898ddd4443b3 + updating to a hidden changeset 898ddd4443b3 (hidden revision '898ddd4443b3' was rewritten as: befae6138569) working directory parent is obsolete! (898ddd4443b3)
--- a/tests/test-evolve-obshistory-amend-then-fold.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Fri May 28 00:28:25 2021 +0800 @@ -401,15 +401,15 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update --hidden 0dec01379d3b + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update 0dec01379d3b
--- a/tests/test-evolve-obshistory-amend.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-amend.t Fri May 28 00:28:25 2021 +0800 @@ -201,9 +201,9 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden "desc(A0)" + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 4ae3a4151de9)
--- a/tests/test-evolve-obshistory-content-divergent.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-content-divergent.t Fri May 28 00:28:25 2021 +0800 @@ -40,9 +40,9 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" @@ -443,8 +443,8 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-evolve-obshistory-fold.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-fold.t Fri May 28 00:28:25 2021 +0800 @@ -324,9 +324,9 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update 0dec01379d3b @@ -334,9 +334,9 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(B0)' + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192)
--- a/tests/test-evolve-obshistory-lots-of-splits.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Fri May 28 00:28:25 2021 +0800 @@ -434,8 +434,8 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))' + updating to a hidden changeset de7290d8b885 + (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset de7290d8b885 - (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) working directory parent is obsolete! (de7290d8b885) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
--- a/tests/test-evolve-obshistory-phase-divergent.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-phase-divergent.t Fri May 28 00:28:25 2021 +0800 @@ -36,9 +36,9 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg phase -p .
--- a/tests/test-evolve-obshistory-prune.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-prune.t Fri May 28 00:28:25 2021 +0800 @@ -109,9 +109,9 @@ (use --hidden to access hidden revisions) [255] $ hg up --hidden -r 'desc(B0)' + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' is pruned) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor)
--- a/tests/test-evolve-obshistory-split.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-obshistory-split.t Fri May 28 00:28:25 2021 +0800 @@ -255,9 +255,9 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))' + updating to a hidden changeset 471597cad322 + (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471597cad322 - (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
--- a/tests/test-evolve-phase-divergence.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-phase-divergence.t Fri May 28 00:28:25 2021 +0800 @@ -124,7 +124,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 2:98bb3a6cfe1a tweak a @@ -294,7 +293,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 4:d47f2b37ed82 added bar to foo @@ -432,7 +430,6 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets b756eb10ea73 - 1 local changesets published (run 'hg update' to get a working copy) $ hg push ../public @@ -454,7 +451,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 7:2c3560aedead foo to bar @@ -585,7 +581,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg debugobsolete 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 28 00:28:25 2021 +0800 @@ -72,7 +72,7 @@ On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: $ hg up 2 --hidden -q - updated to hidden changeset 155349b645be + updating to a hidden changeset 155349b645be (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) working directory parent is obsolete! (155349b645be)
--- a/tests/test-evolve-public-content-divergent-main.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-public-content-divergent-main.t Fri May 28 00:28:25 2021 +0800 @@ -50,7 +50,7 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updated to hidden changeset 5f6d8a4bf34a + updating to a hidden changeset 5f6d8a4bf34a (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) working directory parent is obsolete! (5f6d8a4bf34a) @@ -144,7 +144,7 @@ Amend again to create a cset divergent to public one: $ hg up 1 --hidden -q - updated to hidden changeset 5f6d8a4bf34a + updating to a hidden changeset 5f6d8a4bf34a (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) working directory parent is obsolete! (5f6d8a4bf34a)
--- a/tests/test-evolve-templates.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-templates.t Fri May 28 00:28:25 2021 +0800 @@ -68,9 +68,9 @@ Check templates --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -166,9 +166,9 @@ $ hg up 'desc(A1)' --hidden + updating to a hidden changeset a468dc9b3633 + (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset a468dc9b3633 - (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) working directory parent is obsolete! (a468dc9b3633) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -353,9 +353,9 @@ --------------- $ hg up 'obsolete()' --hidden + updating to a hidden changeset 471597cad322 + (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471597cad322 - (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) @@ -496,9 +496,9 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -526,9 +526,9 @@ o ea207398892e $ hg up 'desc(B0)' --hidden + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -641,9 +641,9 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" @@ -682,9 +682,9 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) @@ -860,9 +860,9 @@ --------------- $ hg up 'desc(A0)' --hidden + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog @@ -888,9 +888,9 @@ o ea207398892e $ hg up 'desc(B0)' --hidden + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog @@ -926,9 +926,9 @@ $ hg up 'desc(B1)' --hidden + updating to a hidden changeset b7ea6d14e664 + (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset b7ea6d14e664 - (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) working directory parent is obsolete! (b7ea6d14e664) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog @@ -1201,9 +1201,9 @@ o ea207398892e $ hg up -r "desc(B0)" --hidden + updating to a hidden changeset 0dec01379d3b + (hidden revision '0dec01379d3b' is pruned) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' is pruned) working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor) $ hg tlog @@ -1608,9 +1608,9 @@ o ea207398892e $ hg up --hidden 4 + updating to a hidden changeset 9bd10a0775e4 + (hidden revision '9bd10a0775e4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 9bd10a0775e4 - (hidden revision '9bd10a0775e4' has diverged) working directory parent is obsolete! (9bd10a0775e4) (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg rebase -r 7 -d 8 --config extensions.rebase= @@ -1685,9 +1685,9 @@ ------------ $ hg up "desc(A0)" --hidden + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' is pruned) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its parent successor) $ hg tlog
--- a/tests/test-evolve-topic.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-topic.t Fri May 28 00:28:25 2021 +0800 @@ -436,10 +436,10 @@ update to obsolete revision $ hg up -r 'min(desc("add fff"))' --hidden + updating to a hidden changeset 6a6b7365c751 + (hidden revision '6a6b7365c751' was rewritten as: 2c295936ac04) switching to topic foo 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset 6a6b7365c751 - (hidden revision '6a6b7365c751' was rewritten as: 2c295936ac04) working directory parent is obsolete! (6a6b7365c751) (use 'hg evolve' to update to its successor: 2c295936ac04)
--- a/tests/test-evolve-wdir.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve-wdir.t Fri May 28 00:28:25 2021 +0800 @@ -49,9 +49,9 @@ $ mkcommit c_B $ hg amend -m "u_B" $ hg up -r 'desc(c_B)' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' was rewritten as: 9bf151312dec) working directory parent is obsolete! (707ee88b2870) (use 'hg evolve' to update to its successor: 9bf151312dec) @@ -73,9 +73,9 @@ working directory is now at 9f0188af4c58 1 changesets pruned $ hg up -r 'desc(c_B)' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' is pruned) working directory parent is obsolete! (707ee88b2870) (use 'hg evolve' to update to its parent successor) @@ -94,9 +94,9 @@ $ hg metaedit -r 'desc(c_B)' -d '0 1' --hidden 2 new content-divergent changesets $ hg up -r 'min(desc(c_B))' --hidden + updating to a hidden changeset 707ee88b2870 + (hidden revision '707ee88b2870' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 707ee88b2870 - (hidden revision '707ee88b2870' has diverged) working directory parent is obsolete! (707ee88b2870) (707ee88b2870 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-evolve.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-evolve.t Fri May 28 00:28:25 2021 +0800 @@ -1234,18 +1234,18 @@ Shows "use 'hg evolve' to..." hints iff the evolve command is enabled $ hg --hidden up 14 + updating to a hidden changeset 484fb3cfa7f2 + (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 484fb3cfa7f2 - (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) working directory parent is obsolete! (484fb3cfa7f2) $ cat >> $HGRCPATH <<EOF > [experimental] > evolutioncommands=evolve > EOF $ hg --hidden up 15 + updating to a hidden changeset daa1ff1c7fbd + (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset daa1ff1c7fbd - (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) working directory parent is obsolete! (daa1ff1c7fbd) (use 'hg evolve' to update to its successor: 0c049e4e5422) @@ -1491,9 +1491,9 @@ @ 1:ab832e43dd5a added a $ hg up f7ad41964313 --hidden + updating to a hidden changeset f7ad41964313 + (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset f7ad41964313 - (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) working directory parent is obsolete! (f7ad41964313) (use 'hg evolve' to update to its successor: ab832e43dd5a)
--- a/tests/test-obsolete.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-obsolete.t Fri May 28 00:28:25 2021 +0800 @@ -121,7 +121,7 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q - updated to hidden changeset 0d3f46688ccc + updating to a hidden changeset 0d3f46688ccc (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) @@ -549,7 +549,7 @@ adding changesets adding manifests adding file changes - added 1 changesets with 1 changes to 1 files + added 1 changesets with 1 changes to [12] files (re) 2 new obsolescence markers obsoleted 1 changesets $ hg up -q 'desc("re:^add obsol_c'\''$")' @@ -693,9 +693,9 @@ Check import reports new unstable changeset: $ hg up --hidden 'desc("re:^add c$")' + updating to a hidden changeset 4538525df7e2 + (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) 1 files updated, 0 files merged, 3 files removed, 0 files unresolved - updated to hidden changeset 4538525df7e2 - (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) working directory parent is obsolete! (4538525df7e2) (use 'hg evolve' to update to its successor: 725c380fe99b) $ hg export 'desc("re:^add obsol_d'\'\''$")' | hg import -
--- a/tests/test-prune.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-prune.t Fri May 28 00:28:25 2021 +0800 @@ -468,7 +468,7 @@ update to obsoleted revision and perform prune on unrelated revision: $ hg up -r "desc('added b')" --hidden -q - updated to hidden changeset 5f6d8a4bf34a + updating to a hidden changeset 5f6d8a4bf34a (hidden revision '5f6d8a4bf34a' is pruned) working directory parent is obsolete! (5f6d8a4bf34a)
--- a/tests/test-topic-stack-complex.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-topic-stack-complex.t Fri May 28 00:28:25 2021 +0800 @@ -147,10 +147,10 @@ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -r . ec94a1ed1330 tip - $ hg up --hidden 'min(predecessors(.))' + $ hg up --hidden 'min(precursors(.))' + updating to a hidden changeset f1d3649d6a8b + (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset f1d3649d6a8b - (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330) working directory parent is obsolete! (f1d3649d6a8b) (use 'hg evolve' to update to its successor: ec94a1ed1330) $ hg amend -d '0 1'
--- a/tests/test-topic.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-topic.t Fri May 28 00:28:25 2021 +0800 @@ -653,7 +653,6 @@ adding file changes added 3 changesets with 3 changes to 1 files new changesets 7c34953036d6:ae074045b7a7 - 1 local changesets published active topic 'query' is now empty (run 'hg update' to get a working copy) $ hg topics
--- a/tests/test-touch.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-touch.t Fri May 28 00:28:25 2021 +0800 @@ -32,9 +32,9 @@ $ hg add b $ hg commit -m ab --amend $ hg up --hidden 1 + updating to a hidden changeset [0-9a-f]{12} (re) + (hidden revision '*' was rewritten as: *) (glob) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset * (glob) - (hidden revision '*' was rewritten as: *) (glob) working directory parent is obsolete! (*) (glob) (use 'hg evolve' to update to its successor: *) (glob) $ hg log -G
--- a/tests/test-uncommit.t Fri May 28 00:23:12 2021 +0800 +++ b/tests/test-uncommit.t Fri May 28 00:28:25 2021 +0800 @@ -240,10 +240,10 @@ Test phase is preserved, no local changes $ hg up -C 3 --hidden + updating to a hidden changeset 5eb72dbe0cb4 + (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) - updated to hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) working directory parent is obsolete! (5eb72dbe0cb4) (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge @@ -289,9 +289,9 @@ Test --all $ hg up -C 3 --hidden + updating to a hidden changeset 5eb72dbe0cb4 + (hidden revision '5eb72dbe0cb4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' has diverged) working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg --config extensions.purge= purge