tests/test-merge8
author Mads Kiilerich <mads@kiilerich.com>
Wed, 31 Mar 2010 11:07:46 +0200
branchstable
changeset 10802 6e4cf8319f54
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
check-code.py: Check for bare ^ Solaris sh interprets ^ as some kind of piping symbol.

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