tests/test-merge8
author Eric Hopper <hopper@omnifarious.org>
Sat, 09 Sep 2006 18:25:06 -0700
changeset 3447 ef1032c223e7
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
sshrepo: add passing of lookup exceptions

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