Read about our upcoming Code of Conduct on this issue

[RFC] mergestate: store about files resolved in favour of other

This starts storing information in mergestate about files which were
automatically merged and the other/remote version of file was used.
We need this information at commit to pick the filenode parent for the new
commit. The commit code has weird filenode resolution here which does not depend
on what merge did and rely on some file ancestry logic. That leads to problem in
some cases, the tests which are changed by this patch.

Somethings which can be further investigated are:

1) refactoring of commit logic more to depend on this information
2) maybe a more generic solution?
10 jobs for topic/default/resolved-other-mergestate in 25 minutes and 55 seconds (queued for 7 seconds)
Status Name Job ID Coverage
  Test
passed checks-py2 #67919

00:04:54

passed checks-py3 #67920

00:03:52

passed rust-cargo-test-py2 #67921

00:03:10

passed rust-cargo-test-py3 #67922

00:03:00

passed test-py2 #67923

00:20:42

passed test-py2-pure #67925

00:25:55

passed test-py2-rust #67927

00:21:37

passed test-py3 #67924

00:19:29

passed test-py3-pure #67926

00:12:34

passed test-py3-rust #67928

00:13:20