tests/test-merge8
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Thu, 21 Feb 2008 23:00:50 +0100
changeset 6164 0c2b443fb3c3
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: make qclone ask remote source repo for qbase using lookup protocol

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