tests/test-merge8
author Dirkjan Ochtman <djc.ochtman@kentyde.com>
Sun, 07 Feb 2010 13:49:52 +0100
changeset 10361 49cd2e7fd91c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: deprecate qinit and qcommit

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