tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 18 Feb 2008 19:20:22 +0100
changeset 6141 90e5c82a3859
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Backed out changeset b913d3aacddc (see issue971/msg5317)

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