Mercurial > hg
view tests/test-copy-move-merge @ 6087:12856a1742dc
better handle errors with date parsing (issue983)
Windows cannot always handle a 1970-01-01 parameter to time.mktime().
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Wed, 13 Feb 2008 16:46:43 +0100 |
parents | 8d9bdcbb2b18 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo 1 > a hg ci -qAm "first" -d "1000000 0" hg cp a b hg mv a c echo 2 >> b echo 2 >> c hg ci -qAm "second" -d "1000000 0" hg co -C 0 echo 0 > a echo 1 >> a hg ci -qAm "other" -d "1000000 0" hg merge --debug echo "-- b --" cat b echo "-- c --" cat c