view tests/test-586 @ 6087:12856a1742dc

better handle errors with date parsing (issue983)

Windows cannot always handle a 1970-01-01 parameter to time.mktime().

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A