tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 14 Jan 2008 09:00:23 +0100
changeset 5855 a6ccb957fd07
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.

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