tests/test-merge8
author Brendan Cully <brendan@kublai.com>
Mon, 25 Jun 2007 15:57:01 -0700
changeset 4722 487943b52a6c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
mq: regularize patch header creation. Do not prefix qnew patches with [mq]: when a message has been given. Always use [mq]: as the prefix for generated commit messages.

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