Mercurial > hg
view tests/test-parse-date.out @ 2775:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 Aug 2006 15:24:41 -0500 |
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