tests/test-merge8
author Eric Hopper <hopper@omnifarious.org>
Thu, 17 May 2007 20:09:49 -0700
changeset 4441 32ea809e5bd1
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Alter test to test import --exact to make sure it works with branches.

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