view tests/test-filelog.py.out @ 45580:76d79b80d953

merge: disable `m2-vs-ma` optimization if new filenode config is true The `m2-vs-ma` optimization filters out the file which have not changed between second parent and the ancestor of the merge. This results in the m1-vs-m2 diff not processing those files. These files will be required when we are creating new filenode for salvaged cases as we need to track them to store in mergestate that file can be salvaged. Differential Revision: https://phab.mercurial-scm.org/D9027
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 14 Sep 2020 14:40:12 +0530
parents d76ba2090e0c
children
line wrap: on
line source

ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.