tests/test-merge8
author Emanuele Aina <em@nerd.ocracy.org>
Wed, 06 Jun 2007 22:17:35 +0200
changeset 4691 ca4971347e0a
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
purge: don't delete ignored files if --all is not specified

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