tests/test-merge8
author Martin Geisler <mg@lazybytes.net>
Sun, 31 May 2009 01:30:16 +0200
changeset 8663 45f626a39def
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
wrap string literals in error messages

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