view tests/test-strict @ 6672:6004eedb13f4

keyword: mimic cmdutil.bail_if_changed even more

At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message

#!/bin/sh

hg init

echo a > a
hg ci -d '0 0' -Ama

hg an a

echo "[ui]" >> $HGRCPATH
echo "strict=True" >> $HGRCPATH

hg an a
hg annotate a

echo % should succeed - up is an alias, not an abbreviation

hg up