view tests/test-lock-badness @ 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 a
echo a > a/a
hg --cwd a ci -A -m a
hg clone a b
echo b > b/b
hg --cwd b ci -A -m b
chmod 100 a/.hg/store
hg --cwd b push ../a
chmod 700 a/.hg/store