view tests/test-pull @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m 1
hg verify
hg serve -p $HGPORT -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
cd ..

http_proxy= hg clone --pull http://localhost:$HGPORT/ copy | sed -e 's,:[0-9][0-9]*/,/,'
cd copy
hg verify
hg co
cat foo
hg manifest --debug
hg pull | sed -e 's,:[0-9][0-9]*/,/,'

echo % issue 622
cd ..
hg init empty
cd empty
hg pull -u ../test