tests/test-merge8
author Brodie Rao <brodie@bitheap.org>
Fri, 02 Apr 2010 15:22:15 -0500
changeset 10825 781689b9b6bb
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
record: make use of output labeling

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