tests/test-merge8
author Martin Geisler <mg@daimi.au.dk>
Sat, 04 Apr 2009 23:18:03 +0200
changeset 7994 3c22fdc741d8
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: word-wrap help texts at 70 characters

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