view tests/test-merge8 @ 4364:97962a3e73cf

Work around problem where 'del os.environ["FOO"]' doesn't update environment. test-hook failed since changeset 949516072388 because of this on Solaris 8.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 19 Apr 2007 13:04:26 +0200
parents efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update