view tests/test-casefolding.out @ 6933:17bdcd59b9ad

keyword: avoid additional conflicts during merge/resolve

Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:

$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other

and will again be expanded on commit.
Demonstrate in test case.

% test file addition with bad case
adding a
A a
a
% test case collision on rename (issue 750)
adding a
a
committed changeset 07f494440405
A: not overwriting - file exists
% test case collision between revisions (issue 912)
adding a
adding A
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved