Mercurial > hg
view tests/test-convert-hg-source.out @ 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 | 11e1e574da02 |
| children | 180a3eee4b75 |
line wrap: on
line source
merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) initializing destination new repository scanning source... sorting... converting... 4 add foo bar 3 change foo 2 make bar and baz copies of foo 1 merge local copy 0 merge remote copy comparing with ../orig searching for changes no changes found