view tests/test-commit.out @ 3387:ba7c74081861

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Oct 2006 17:58:04 -0500
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