Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-commit.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | c9cd63a6fce9 |
children | a2d93b186a0e |
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 abort: No such file or directory: .../test/bar