tests/test-simple-update
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 19 Feb 2006 18:59:20 +0100
changeset 1748 2428e6d66f06
parent 814 0902ffece4b4
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
bisect: fix for recent changes disallowing "false" merges

#!/bin/sh

set -e

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

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

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