tests/test-merge8
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 02 Jul 2008 12:02:33 +0200
changeset 6796 943f066c0d58
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Backed out changeset 4879468fa28f (incorrect Content-Length on Windows)

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