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

cat >> $HGRCPATH <<EOF
[extensions]
alias=

[alias]
myinit = init
cleanstatus = status -c
unknown = bargle
ambiguous = s
recursive = recursive
EOF

echo '% basic'
hg myinit alias

echo '% unknown'
hg unknown

echo '% ambiguous'
hg ambiguous

echo '% recursive'
hg recursive

cd alias
echo foo > foo
hg ci -Amfoo

echo '% with opts'
hg cleanst