tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:47:58 +0200
changeset 5144 6e040f6c2c9c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Print less scary message if the system supports symlinks: "Skipping test-no-symlinks: system supports symbolic links" instead of "Skipping test-no-symlinks: unexpected feature: symbolic links"

#!/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