tests/test-merge8
author Christian Ebert <blacktrash@gmx.net>
Thu, 28 Jun 2007 02:11:54 +0200
changeset 4817 c10d3bc05a8d
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
setup.py not executable: change instructions at beginning of file

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