view tests/test-586 @ 6050:adf73753eb7d

keyword: fix pychecker warning about shadowed variable

Also no underscore prefix for restricted switch inside reposetup.

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A