Mercurial > hg-stable
view tests/test-parse-date.out @ 6385:0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 24 Mar 2008 15:36:56 -0700 |
| parents | 4b0c9c674707 |
| children | 8c6f823efcc9 |
line wrap: on
line source
reverting a created new head changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 merging with changeset 3:107ce1ee2b43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) abort: invalid date: 'should fail' abort: date exceeds 32 bits: 100000000000000000 abort: impossible time zone offset: 1400000 Sun Jan 15 13:30:00 2006 +0500 Sun Jan 15 13:30:00 2006 -0800 Sat Jul 15 13:30:00 2006 +0500 Sat Jul 15 13:30:00 2006 -0700 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 internal: 1000000000 -16200 standard: Sun Sep 09 06:16:40 2001 +0430 internal: 1000000000 -15300 standard: Sun Sep 09 06:01:40 2001 +0415 internal: 1000000000 -14400 standard: Sun Sep 09 05:46:40 2001 +0400 internal: 1000000000 0 standard: Sun Sep 09 01:46:40 2001 +0000 internal: 1000000000 14400 standard: Sat Sep 08 21:46:40 2001 -0400 internal: 1000000000 15300 standard: Sat Sep 08 21:31:40 2001 -0415 internal: 1000000000 16200 standard: Sat Sep 08 21:16:40 2001 -0430 internal: 999967600 -16200 standard: Sat Sep 08 21:16:40 2001 +0430 internal: 1000000000 16200 standard: Sat Sep 08 21:16:40 2001 -0430