tests/test-issue612
author Brendan Cully <brendan@kublai.com>
Sat, 04 Aug 2007 23:07:52 -0700
changeset 5071 35d47b06d4e3
parent 4820 9797124581c9
permissions -rwxr-xr-x
patch: add git symlink support

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