tests/test-merge8
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 13:10:27 -0700
changeset 4432 905397be7688
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: add qgoto command.

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