tests/test-merge8
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 09 Mar 2010 16:03:57 +0100
branchstable
changeset 10612 30553ac3e355
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
demandimport: blacklist _ssl (issue1964)

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