tests/test-merge8
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 25 Aug 2007 11:30:11 +0200
changeset 5224 9cd6578750b9
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
improve error message for 'hg merge' when repo already at branchtip

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