diff hg @ 34998:a92b9f8e11ba stable 4.4.2

merge: check created file dirs for path conflicts only once (issue5716) In large repositories, updates involving the creation of many files check the same directories repeatedly in the wctx manifest. Move these checks out to a separate loop to avoid repeated checks hitting the manifest. Differential Revision: https://phab.mercurial-scm.org/D1226
author Mark Thomas <mbthomas@fb.com>
date Fri, 24 Nov 2017 12:53:58 -0800
parents 163fa0aea71e
children 5e78c100a215
line wrap: on
line diff