tests/test-merge8
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Sat, 03 Nov 2007 11:11:13 +0100
changeset 5663 99fdef2e6793
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Add output markers to test-bundle so it's easier to spot the source of output diffs.

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