view tests/test-simple-update @ 690:f762860f82c6

Minor merge fixups

return a proper errorlevel on abort
let force jump across branches
catch exception on unlink

manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

#!/bin/sh

set -ex

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -t "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest