tests/test-merge8
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 27 Jul 2007 14:30:20 -0700
changeset 5024 7963438881f5
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
convert: empty log messages are OK as of 7f5c3fb0a37d

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