annotate tests/test-filelog.py.out @ 47916:65e3d8028f2e

dirstate: drop the `_merge` method It only has one caller that only use one of the branch, so lets inline that branch and clean things up further. Differential Revision: https://phab.mercurial-scm.org/D11351
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:16:48 +0200
parents d76ba2090e0c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11540
2370e270a29a filelog: test behaviour for data starting with "\1\n"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
1 ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
2370e270a29a filelog: test behaviour for data starting with "\1\n"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
2 OK.