view tests/test-paths @ 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.

#!/bin/sh
hg init a
hg clone a b
cd a
echo '[paths]' >> .hg/hgrc
echo 'dupe = ../b' >> .hg/hgrc
hg in dupe | fgrep '../'
cd ..
hg -R a in dupe | fgrep '../'
true