comparison mercurial/scmutil.py @ 39132:873f3a56993f

context: make sure file is not deleted while checking path conflicts If a file is deleted and a directory of same name is created in the same commit, IMM thinks of that as a file conflict, however the file is deleted and hence the directory can be created. The test change demonstrate the fix. Differential Revision: https://phab.mercurial-scm.org/D4300
author Pulkit Goyal <pulkit@yandex-team.ru>
date Thu, 16 Aug 2018 16:59:40 +0300
parents ad88726d6982
children 7a759ad2d06d
comparison
equal deleted inserted replaced
39131:02e80e37fbbc 39132:873f3a56993f