equal
deleted
inserted
replaced
1 reverting a |
1 reverting a |
2 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
2 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
3 merging with changeset 2:e6c3abc120e7 |
3 merging with changeset 2:e6c3abc120e7 |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 (branch merge, don't forget to commit) |
5 (branch merge, don't forget to commit) |
6 abort: invalid date: 'should fail' |
6 abort: invalid date: 'should fail' see hg(1) manual page for details |
7 transaction abort! |
7 transaction abort! |
8 rollback completed |
8 rollback completed |
9 abort: date exceeds 32 bits: 100000000000000000 |
9 abort: date exceeds 32 bits: 100000000000000000 |
10 transaction abort! |
10 transaction abort! |
11 rollback completed |
11 rollback completed |