tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Fri, 04 Jun 2010 17:22:33 -0500
changeset 11285 f118029e534c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
rebase: use usual util.abort rather than error.ParseError

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