tests/test-simple-update
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jul 2005 17:14:05 +0100
changeset 792 49ec802b4a16
parent 749 7e4843b7efd2
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Added tests for bug with three-way-merging of old tip, tip and cwd.

#!/bin/sh

set -ex

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