tests/test-merge8
author Brendan Cully <brendan@kublai.com>
Thu, 06 Sep 2007 18:12:36 -0700
changeset 5286 cbec83d9b0b4
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Update test-record for 3ef190234b55

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