tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 16 Oct 2006 22:44:44 +0200
changeset 3417 6bd676ee8b99
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Explicitly use "tip" in revision navigation. Rationale: the tip revision is a moving target and if somebody wants tip, it should be delivered.

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