tests/test-merge8
author Marti Raudsepp <marti@juffo.org>
Fri, 06 Nov 2009 13:48:17 +0200
changeset 9730 732fc0e9d411
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
patchbomb: fix 'echo -en' bashism in test-patchbomb The echo command doesn't accept options in some shells. printf is required by the SUSv2 (Single UNIX Specification v2).

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