view tests/test-identify @ 11353:f2b25e8ea6c1

merge: when current branch has 1 or > 2 heads, actually abort.

Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.

#!/bin/sh

"$TESTDIR/hghave" no-outer-repo || exit 80

echo % no repo
hg id

echo % create repo
hg init test
cd test
echo a > a
hg ci -Ama

echo % basic id usage
hg id
hg id --debug
hg id -q
hg id -v

echo % with options
hg id -r.
hg id -n
hg id -t
hg id -b
hg id -i
hg id -n -t -b -i

echo % with modifications
echo b > a
hg id -n -t -b -i

echo % other local repo
cd ..
hg -R test id
hg id test

echo % with remote http repo
cd test
hg serve -p $HGPORT1 -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
hg id http://localhost:$HGPORT1/

echo % remote with tags?
hg id -t http://localhost:$HGPORT1/

true # ends with util.Abort -> returns 255