view tests/test-issue612 @ 4830:b68b250f9537

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 06 Jul 2007 08:48:28 +0200
parents 9797124581c9
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st