tests/test-merge8
author Joel Rosdahl <joel@rosdahl.net>
Mon, 04 Jun 2007 21:48:59 +0200
changeset 4504 c68e6486f295
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Add test reproducing a bug in "hg serve -v"

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