Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-parse-date.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:14:29 +0200 |
| parents | c1974f65d781 |
| children | eef469259745 |
line wrap: on
line source
reverting a changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 merging with changeset 2:99a1acecff55 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) abort: invalid date: 'should fail' transaction abort! rollback completed abort: date exceeds 32 bits: 100000000000000000 transaction abort! rollback completed abort: impossible time zone offset: 1400000 transaction abort! rollback completed Sun Jun 11 00:26:40 2006 -0400 Sat Apr 15 13:30:00 2006 +0200 Sat Apr 15 13:30:00 2006 +0000 Wed Feb 01 13:00:30 2006 -0500 Wed Feb 01 13:00:30 2006 +0000