Mercurial > evolve
changeset 6921:4b843ae726de mercurial-4.9
test-compat: merge mercurial-5.0 into mercurial-4.9
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 25 Oct 2024 18:14:41 +0400 |
parents | e885fc210015 (diff) df546ef8d75f (current diff) |
children | f4f5ae0bfc29 |
files | |
diffstat | 6 files changed, 70 insertions(+), 104 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-progress.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-evolve-progress.t Fri Oct 25 18:14:41 2024 +0400 @@ -28,7 +28,6 @@ atop:[4] first v2 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 evolve: 1/3 changesets (33.33%) - searching for copies back to rev 0 resolving manifests branchmerge: True, force: True, partial: False ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 @@ -43,11 +42,6 @@ move:[2] third hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) - searching for copies back to rev 0 - unmatched files in other (from base): - b - unmatched files in other (from topological common ancestor): - b resolving manifests branchmerge: True, force: True, partial: False ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 @@ -62,7 +56,6 @@ move:[3] fourth hg rebase -r 22782fddc0ab -d 53c0008d98a0 evolve: 3/3 changesets (100.00%) - searching for copies back to rev 0 resolving manifests branchmerge: True, force: True, partial: False ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab @@ -96,7 +89,6 @@ atop:[8] first v3 hg rebase -r 5f16d91ecde0 -d 152c368c622b evolve: 1/1 changesets (100.00%) - searching for copies back to rev 4 resolving manifests branchmerge: True, force: True, partial: False ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 @@ -127,7 +119,6 @@ atop:[10] first v4 hg rebase -r df5d742141b0 -d f8d7d38c0a88 evolve: 1/3 changesets (33.33%) - searching for copies back to rev 8 resolving manifests branchmerge: True, force: True, partial: False ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 @@ -162,11 +153,6 @@ atop:[11] second hg rebase -r 53c0008d98a0 -d c8caf623f57b evolve: 2/3 changesets (66.67%) - searching for copies back to rev 4 - unmatched files in other (from base): - b - unmatched files in other (from topological common ancestor): - b resolving manifests branchmerge: True, force: True, partial: False ancestor: 5f16d91ecde0, local: c8caf623f57b+, remote: 53c0008d98a0 @@ -180,7 +166,6 @@ move:[7] fourth hg rebase -r 385376d04062 -d 55f7ff45dec4 evolve: 3/3 changesets (100.00%) - searching for copies back to rev 4 resolving manifests branchmerge: True, force: True, partial: False ancestor: 53c0008d98a0, local: 55f7ff45dec4+, remote: 385376d04062
--- a/tests/test-split.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-split.t Fri Oct 25 18:14:41 2024 +0400 @@ -785,18 +785,9 @@ (remaining changes gathered with unmatched one) -adding content in files to make sure that it prompt us to select the changes, -as it won't prompt if a file has no changes at hunk level and passed in cli -(for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX" -for files which are explicitly mentioned by user) - $ echo sp2 > SPLIT2 - $ echo sp3 > SPLIT3 - $ echo sp4 > SPLIT4 - $ hg amend - $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > c > EOF 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -805,18 +796,13 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] c - $ hg status --change '.~1' A SPLIT2 $ hg status --change '.' @@ -830,7 +816,7 @@ $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > y > y > EOF @@ -840,25 +826,18 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record this change to 'SPLIT3'? [Ynesfdaq?] y + examine changes to 'SPLIT3'? [Ynesfdaq?] y no more changes to split - $ hg status --change '.~2' A SPLIT2 $ hg status --change '.~1' @@ -881,15 +860,11 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y + examine changes to 'SPLIT3'? [Ynesfdaq?] y no more changes to split $ hg status --change '.~1' @@ -905,7 +880,7 @@ $ hg split SPLIT2 SPLIT3 << EOF > y - > s + > n > d > EOF 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -914,15 +889,11 @@ adding SPLIT4 diff --git a/SPLIT2 b/SPLIT2 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp2 - record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y + examine changes to 'SPLIT2'? [Ynesfdaq?] y diff --git a/SPLIT3 b/SPLIT3 new file mode 100644 - @@ -0,0 +1,1 @@ - +sp3 - record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s + examine changes to 'SPLIT3'? [Ynesfdaq?] n continue splitting? [Ycdq?] d discarding remaining changes
--- a/tests/test-topic-flow-publish-flag.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-topic-flow-publish-flag.t Fri Oct 25 18:14:41 2024 +0400 @@ -441,8 +441,10 @@ $ grep double branch2* | sort branch2-base:* o double//slash (glob) branch2-immutable:* o double//slash (glob) + branch2-served:* o double//slash (glob) $ cd $TESTTMP/bare-branch-server/.hg/cache/ $ grep double branch2* | sort branch2-base:* o double//slash (glob) branch2-immutable:* o double//slash (glob) + branch2-served:* o double//slash (glob)
--- a/tests/test-topic.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-topic.t Fri Oct 25 18:14:41 2024 +0400 @@ -957,10 +957,6 @@ 3: featureA $ tlog 'featureA#topic[0]' 3: featureA - $ tlog 'featureA#topic[:]' - 1: featureA - 2: featureA - 3: featureA $ tlog '2#t[-2]' $ tlog '2#t[-1]' @@ -970,10 +966,6 @@ $ tlog '2#t[1]' 3: featureA $ tlog '2#t[2]' - $ tlog '2#t[-1:1]' - 1: featureA - 2: featureA - 3: featureA stack subscript relation @@ -1003,28 +995,6 @@ $ tlog 'featureA#s[0]' 0: - $ tlog 'featureA#s[0:0]' - 0: - $ tlog 'featureA#s[:]' - 1: featureA - 2: featureA - 3: featureA - $ tlog 'featureA#s[2:]' - 2: featureA - 3: featureA - $ tlog 'featureA#s[:2]' - 1: featureA - 2: featureA - $ tlog 'featureA#s[0:1]' - 0: - 1: featureA - $ tlog 'featureA#s[-1:0]' - 0: - 3: featureA - $ tlog 'featureA#s[-3:3]' - 1: featureA - 2: featureA - 3: featureA $ tlog 'featureA#s[1] and featureA#s[-3]' 1: featureA $ tlog 'featureA#s[2] and featureA#s[-2]'
--- a/tests/test-touch.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-touch.t Fri Oct 25 18:14:41 2024 +0400 @@ -299,24 +299,56 @@ x 3: merge |\ ~ ~ - $ hg debugpathcopies 'min(desc("base"))' 'min(desc("merge"))' - base -> copy-on-left - base -> copy-on-right - $ hg debugpathcopies 'min(desc("base"))' 'max(desc("merge"))' - base -> copy-on-left - base -> copy-on-right - $ hg debugpathcopies 'min(desc("left"))' 'min(desc("merge"))' - base -> copy-on-right - left -> merge-copy-left - $ hg debugpathcopies 'min(desc("left"))' 'max(desc("merge"))' - base -> copy-on-right - left -> merge-copy-left - $ hg debugpathcopies 'min(desc("right"))' 'min(desc("merge"))' - base -> copy-on-left - right -> merge-copy-right - $ hg debugpathcopies 'min(desc("right"))' 'max(desc("merge"))' - base -> copy-on-left - right -> merge-copy-right + $ hg status --copies --rev 'min(desc("base"))' --rev 'min(desc("merge"))' + A copy-on-left + base + A copy-on-right + base + A left + A merge-copy-left + A merge-copy-right + A right + $ hg status --copies --rev 'min(desc("base"))' --rev 'max(desc("merge"))' + A copy-on-left + base + A copy-on-right + base + A left + A merge-copy-left + A merge-copy-right + A right + $ hg status --copies --rev 'min(desc("left"))' --rev 'min(desc("merge"))' + M copy-on-left + A copy-on-right + base + A merge-copy-left + left + A merge-copy-right + A right + $ hg status --copies --rev 'min(desc("left"))' --rev 'max(desc("merge"))' + M copy-on-left + A copy-on-right + base + A merge-copy-left + left + A merge-copy-right + A right + $ hg status --copies --rev 'min(desc("right"))' --rev 'min(desc("merge"))' + M copy-on-right + A copy-on-left + base + A left + A merge-copy-left + A merge-copy-right + right + $ hg status --copies --rev 'min(desc("right"))' --rev 'max(desc("merge"))' + M copy-on-right + A copy-on-left + base + A left + A merge-copy-left + A merge-copy-right + right $ cd .. Make sure touch doesn't fail to warn about divergence (issue6107)
--- a/tests/test-uncommit-interactive.t Fri Oct 25 18:11:50 2024 +0400 +++ b/tests/test-uncommit-interactive.t Fri Oct 25 18:14:41 2024 +0400 @@ -796,9 +796,12 @@ $ hg uncommit -i a << DONE > y + > y > DONE diff --git a/a b/a 1 hunks, 1 lines changed + examine changes to 'a'? [Ynesfdaq?] y + @@ -9,3 +9,4 @@ 4 5 @@ -859,10 +862,13 @@ $ hg uncommit -i a << DONE > y + > y > n > DONE diff --git a/a b/a 2 hunks, 2 lines changed + examine changes to 'a'? [Ynesfdaq?] y + @@ -1,3 +1,4 @@ +-3 -2