tests/test-merge8
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 28 Feb 2008 17:51:04 +0100
changeset 6181 d500aeb8092e
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.

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