Users will receive an error about no such file or directory when the code attempts to look at the file that doesn't exist. I'm going to remove commands.resolve.mark-check from tweakdefaults until it's been more tested in real-world scenarios, this is the second case I didn't account for when writing the feature or the tests.
D5225 removes this from tweakdefaults. Haven't written the actual fix changeset yet.
Fixed by https://mercurial-scm.org/repo/hg/rev/8239d4e5d05f Kyle Lippincott <spectral@google.com> tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken See issue6020 for the current case. I don't want to continue attempting to fix this on the stable branch, so I'm removing from tweakdefaults and will send fixes meant for the default branch and 4.9. Differential Revision: https://phab.mercurial-scm.org/D5225 (please test the fix)
bad bot, that doesn't fix it, it just mentions it :D
Bug was set to IN_PROGRESS for 14 days, moving back to confirmed
Fixed by https://mercurial-scm.org/repo/hg/rev/183df3df6031 Kyle Lippincott <spectral@google.com> resolve: fix mark-check when a file was deleted on one side (issue6020) wvfs.open raises an error if one of the files does not exist. Ignoring the error if it's ENOENT is done in several other places in this code, so I'm in good company :) Differential Revision: https://phab.mercurial-scm.org/D5243 (please test the fix)
Bug was set to TESTING for 7 days, resolving