tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 16 Nov 2006 08:52:55 +0100
changeset 3672 e8730b5b8a32
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Merge with crew.

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