Bug 6020 - commands.resolve.mark-check breaks `hg resolve -m` if files are deleted
Summary: commands.resolve.mark-check breaks `hg resolve -m` if files are deleted
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: PC Linux
: wish feature
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-11-05 17:59 UTC by Kyle Lippincott
Modified: 2019-01-26 00:05 UTC (History)
1 user (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Kyle Lippincott 2018-11-05 17:59 UTC
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.
Comment 1 Kyle Lippincott 2018-11-05 19:35 UTC
D5225 removes this from tweakdefaults.  Haven't written the actual fix changeset yet.
Comment 2 HG Bot 2018-11-06 07:20 UTC
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)
Comment 3 Kyle Lippincott 2018-11-06 15:27 UTC
bad bot, that doesn't fix it, it just mentions it :D
Comment 4 Bugzilla 2018-11-21 00:00 UTC
Bug was set to IN_PROGRESS for 14 days, moving back to confirmed
Comment 5 HG Bot 2019-01-18 12:51 UTC
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)
Comment 6 Bugzilla 2019-01-26 00:05 UTC
Bug was set to TESTING for 7 days, resolving