tests/test-merge8
author Martin Geisler <mg@daimi.au.dk>
Sat, 03 Jan 2009 17:15:21 +0100
changeset 7627 fb32ae9c76e7
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot.

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