tests/test-merge8
author Hollis Blanchard <hollisb@us.ibm.com>
Mon, 25 Jun 2007 14:50:25 -0500
changeset 4719 1069205a8894
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
fix 'convert' with single commit repositories The attached patch passes the three 'convert' testcases, and also is able to successfully convert the git.git repository.

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