view tests/test-merge8 @ 10633:3318431f2ab4

test-serve: Show if port config and option are correctly used this will break in d3f27d15c9cb
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 10 Mar 2010 22:05:41 +0100
parents efbe24c7d8d9
children
line wrap: on
line source

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