tests/test-merge8
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 12:16:02 -0700
changeset 4418 0532491f7476
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

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