tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Oct 2006 18:01:25 -0300
changeset 3418 7012c889e8f2
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
portability fixes for some tests Apparently the ls on OS X 10.3.9 exits with success even if the file given on the command line doesn't exist

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