Mercurial > hg
annotate tests/test-filelog.py.out @ 38155:5736570718fe
graft: drop --user and --date values info from hint in case of conflicts
After previous patch, we have started preserving user and date values in
graftstate and reusing them during `hg graft --continue`. Now passing --user and
--date again with --continue makes no sense. Let's drop them from the hint.
Differential Revision: https://phab.mercurial-scm.org/D3660
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 26 May 2018 02:11:09 +0530 |
parents | d76ba2090e0c |
children |
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. |