tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Wed, 18 Oct 2006 10:46:51 -0500
changeset 3452 fcf14d87e0a4
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
If we can't write the branch cache, fail quietly.

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