tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Dec 2006 23:24:30 +0100
changeset 3918 a413f5c29c46
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.

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