tests/test-merge8
author Wagner Bruna <wbruna@softwareexpress.com.br>
Tue, 25 May 2010 13:20:33 -0300
branchstable
changeset 11244 cff6dfe28f02
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
i18n-pt_BR: added message from 1b8aa9ffa7dc

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