Mercurial > hg

diff tests/test-pull-update.t @ 39576:fa4d16daf1be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: don't count deleted files as candidates for path conflicts in IMM This patch makes sure we don't consider the deleted files in our IMM wctx as potential conflicts while calculating paths conflicts. This fixes the bug demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D4543
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 12 Sep 2018 17:45:43 +0300
parents d0abd7949ea3
children d7304434390f
line wrap: on
line diff