tests/test-issue612
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 13 Feb 2008 16:46:43 +0100
changeset 6086 e85deb6dcf9d
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

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