comparison mercurial/bookmarks.py @ 38756:91c405f84cf7 stable

sparse: add test showing `hg merge` is broken while using sparse extension This patch adds a test to demonstrate that `hg merge` is broken in some cases while using sparse extension. The case is when you have a file which is: * modified between current wdir parent and merge base * deleted between merge base and merge destination * excluded from sparse checkout Doing `hg merge` results in file not found error. Next patch will fix this. Differential Revision: https://phab.mercurial-scm.org/D3983
author Pulkit Goyal <pulkit@yandex-team.ru>
date Fri, 27 Jul 2018 14:53:28 +0300
parents fbec9c0b32d3
children fc54a290b4b0
comparison
equal deleted inserted replaced
38755:545a3e6650cd 38756:91c405f84cf7