Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 41281:183df3df6031
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
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Wed, 07 Nov 2018 15:45:09 -0800 |
| parents | 08dd462ea782 |
| children | 876494fd967d 8427fea04017 |
comparison
equal
deleted
inserted
replaced
| 41280:f4277a35c42c | 41281:183df3df6031 |
|---|---|
| 4933 % f) | 4933 % f) |
| 4934 continue | 4934 continue |
| 4935 | 4935 |
| 4936 if mark: | 4936 if mark: |
| 4937 if markcheck: | 4937 if markcheck: |
| 4938 with repo.wvfs(f) as fobj: | 4938 fdata = repo.wvfs.tryread(f) |
| 4939 fdata = fobj.read() | |
| 4940 if filemerge.hasconflictmarkers(fdata) and \ | 4939 if filemerge.hasconflictmarkers(fdata) and \ |
| 4941 ms[f] != mergemod.MERGE_RECORD_RESOLVED: | 4940 ms[f] != mergemod.MERGE_RECORD_RESOLVED: |
| 4942 hasconflictmarkers.append(f) | 4941 hasconflictmarkers.append(f) |
| 4943 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) | 4942 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) |
| 4944 elif unmark: | 4943 elif unmark: |