tests/test-issue612
author Patrick Mezard <pmezard@gmail.com>
Sat, 28 Jul 2007 20:15:54 +0200
changeset 5026 48ebd6a83994
parent 4820 9797124581c9
permissions -rwxr-xr-x
Test qnew --git

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