Read about our upcoming Code of Conduct on this issue

merge: store cases when a file is absent post merge in commitinfo

Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.

User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.

We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.

Differential Revision: https://phab.mercurial-scm.org/D9003
11 jobs for topic/default/merge-newnode-final in 22 minutes and 27 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
failed checks-py2 #108297

00:04:28

failed checks-py3 #108298

00:04:55

passed rust-cargo-test-py2 #108299

00:01:51

passed rust-cargo-test-py3 #108300

00:01:44

passed test-py2 #108301

00:21:32

passed test-py2-chg #108307

00:16:57

passed test-py2-pure #108303

00:19:57

passed test-py2-rust #108305

00:22:25

passed test-py3 #108302

00:11:51

passed test-py3-pure #108304

00:12:22

passed test-py3-rust #108306

00:16:21

 
Name Stage Failure
failed
checks-py3 Test
  0.010  31.354 269.750  15.680  31.344   test-check-config.t
0.021 33.826 287.940 16.010 33.805 test-check-module-imports.t
0.083 50.103 411.190 20.770 50.020 test-check-cargo-lock.t
0.026 60.009 457.680 21.210 59.983 test-check-pyflakes.t
0.000 61.341 505.290 21.880 61.341 test-check-code.t
0.054 110.994 598.550 23.290 110.940 test-check-pylint.t
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1
failed
checks-py2 Test
  0.002  40.331 258.200  25.250  40.329   test-check-config.t
0.002 40.400 277.280 26.010 40.397 test-check-module-imports.t
0.004 49.108 309.130 26.870 49.104 test-check-pyflakes.t
0.011 55.609 421.150 32.090 55.598 test-check-cargo-lock.t
0.000 62.345 465.200 33.180 62.345 test-check-code.t
0.009 100.248 542.300 34.850 100.238 test-check-pylint.t
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1