tests/test-merge8
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 16 Jul 2007 16:50:47 -0700
changeset 4911 fc502517d68d
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: autodetect an existing git patch during qrefresh (issue 491)

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