diff mercurial/subrepoutil.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 b94fecf4cd8c
children 876494fd967d
line wrap: on
line diff