tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Jun 2007 00:34:14 -0300
changeset 4658 17f5d2069551
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: test that qpush cleans things up when it fails

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