Mercurial > evolve
changeset 5758:552efcc2cc30 mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 30 Jan 2021 20:32:38 +0800 |
| parents | 25257b1be6c6 (current diff) 2fe3f20369eb (diff) |
| children | 60a7ee4b6cda 73573aec18f7 |
| files | tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-progress.t |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Fri Jan 29 17:23:31 2021 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Sat Jan 30 20:32:38 2021 +0800 @@ -236,10 +236,10 @@ $ cat >$TESTTMP/test_extension.py << EOF > from mercurial import merge - > origupdate = merge._update + > origupdate = merge.update > def newupdate(*args, **kwargs): > return origupdate(*args, **kwargs) - > merge._update = newupdate + > merge.update = newupdate > EOF $ cat >> $HGRCPATH << EOF > [extensions]
--- a/tests/test-evolve-interrupted.t Fri Jan 29 17:23:31 2021 +0800 +++ b/tests/test-evolve-interrupted.t Sat Jan 30 20:32:38 2021 +0800 @@ -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-progress.t Fri Jan 29 17:23:31 2021 +0800 +++ b/tests/test-evolve-progress.t Sat Jan 30 20:32:38 2021 +0800 @@ -33,7 +33,7 @@ ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 a: remote is newer -> g getting a - updating: a 1/1 files (100.00%) + updating: a 1/2 files (50.00%) committing files: a committing manifest @@ -61,7 +61,7 @@ ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab b: remote is newer -> g getting b - updating: b 1/1 files (100.00%) + updating: b 1/2 files (50.00%) committing files: b committing manifest @@ -94,7 +94,7 @@ ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 a: remote is newer -> g getting a - updating: a 1/1 files (100.00%) + updating: a 1/2 files (50.00%) committing files: a committing manifest @@ -171,7 +171,7 @@ ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 b: remote is newer -> g getting b - updating: b 1/1 files (100.00%) + updating: b 1/2 files (50.00%) committing files: b committing manifest
--- a/tests/test-evolve-templates.t Fri Jan 29 17:23:31 2021 +0800 +++ b/tests/test-evolve-templates.t Sat Jan 30 20:32:38 2021 +0800 @@ -158,11 +158,11 @@ $ hg log -GT '{successors|json}\n' - o [] + o "" | | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |/ - o [] + o "" $ hg up 'desc(A1)' --hidden