tests/test-issue612
author Robert Bachmann <rbach@rbach.priv.at>
Thu, 30 Aug 2007 16:42:17 +0200
changeset 5266 46c5e1ee8aaa
parent 4820 9797124581c9
permissions -rwxr-xr-x
Added support for the Atom syndication format

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