view tests/test-lock-badness @ 2915:013921c753bd

merge with other head by default, not tip.
fixes issue 339.

#!/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
hg --cwd b push ../a
chmod 700 a/.hg