tests/test-merge8
author John Mulligan <phlogistonjohn@asynchrono.us>
Sat, 15 Mar 2008 15:23:20 -0400
changeset 6311 a079cf630065
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Add default local() and cancopy() methods to repository base class

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