view tests/test-commit.out @ 3506:9de0e64545a3

Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 25 Oct 2006 02:51:27 -0300
parents a2d93b186a0e
children 38291d9c8c1c
line wrap: on
line source

abort: impossible time zone offset: 4444444
transaction abort!
rollback completed
abort: invalid date: '1\t15.1' see hg(1) manual page for details
transaction abort!
rollback completed
abort: invalid date: 'foo bar' see hg(1) manual page for details
transaction abort!
rollback completed
abort: invalid date: ' 1 4444' see hg(1) manual page for details
transaction abort!
rollback completed
abort: date exceeds 32 bits: 111111111111
transaction abort!
rollback completed
trouble committing bar!
abort: No such file or directory: .../test/bar