merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
#!/bin/sh
set -e
echo "[extensions]" >> $HGRCPATH
echo "hbisect=" >> $HGRCPATH
echo % init
hg init
echo % committing changes
count=0
echo > a
while test $count -lt 32 ; do
echo 'a' >> a
test $count -eq 0 && hg add
hg ci -m "msg $count" -d "$count 0"
echo % committed changeset $count
count=`expr $count + 1`
done
echo % log
hg log
echo % hg up -C
hg up -C
echo % bisect test
hg bisect init
hg bisect bad
hg bisect good 1
hg bisect good
hg bisect good
hg bisect good
hg bisect bad
hg bisect good