tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Dec 2006 22:33:39 +0100
changeset 3913 283ee8971570
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
doc string fix: hg cat and manifest default to current parent revision.

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