Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

merge: remove no longer required ACTION_GET_OTHER_AND_STORE

In 1b8fd4af3318 I (ab)used merge actions to pass
info from manifestmerge() to applyupdates() and store info in mergestate.

In previous patches, we introduced a separate return value from manifestmerge()
and calculateupdates() and an argument to applyupdates() which achieved the same
thing.

Let's remove this no longer required messy code.

Differential Revision: https://phab.mercurial-scm.org/D8744
11 jobs for topic/default/mergestate-refactor in 36 minutes and 28 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed checks-py2 #85575

00:03:30

passed checks-py3 #85576

00:02:50

passed rust-cargo-test-py2 #85577

00:03:30

passed rust-cargo-test-py3 #85578

00:01:33

passed test-py2 #85579

00:25:30

failed test-py2-chg #85585

00:19:48

passed test-py2-pure #85581

00:23:12

passed test-py2-rust #85583

00:27:31

passed test-py3 #85580

00:18:23

passed test-py3-pure #85582

00:11:28

passed test-py3-rust #85584

00:19:15

 
Name Stage Failure
failed
test-py2-chg Test
Skipped test-verify-repo-operations.py: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-wireproto-command-capabilities.t: system supports running with chg
Skipped test-wireproto-exchangev2-shallow.t: missing feature: sqlite3 module is available
Failed test-chg.t: output changed
# Ran 851 tests, 75 skipped, 1 failed.
python hash seed: 2547802603
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1