tests/test-merge8
author Martin Geisler <mg@aragost.com>
Wed, 11 Aug 2010 12:30:18 +0200
changeset 11780 3cdd6fdc3d9e
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Merge with stable

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