Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-parse-date.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 03 Oct 2007 23:09:36 +0200 |
| parents | 30d4d8985dd8 |
| children |
line wrap: on
line source
reverting a changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 merging with changeset 2:e6c3abc120e7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) transaction abort! rollback completed 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 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