Mercurial > hg
comparison tests/test-excessive-merge.out @ 1933:7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 13 Mar 2006 13:05:41 +0100 |
parents | ef8cd889a78b |
children | 3053fc33f545 |
comparison
equal
deleted
inserted
replaced
1932:82995896d5af | 1933:7544700fd931 |
---|---|
1 changeset: 4:2ee31f665a86 | 1 changeset: 4:f6c172c6198c |
2 tag: tip | 2 tag: tip |
3 parent: 1:96155394af80 | 3 parent: 1:448a8c5e42f1 |
4 parent: 2:92cc4c306b19 | 4 parent: 2:7c5dc2e857f2 |
5 user: test | 5 user: test |
6 date: Thu Jan 1 00:00:00 1970 +0000 | 6 date: Mon Jan 12 13:46:40 1970 +0000 |
7 summary: merge a/b -> blah | 7 summary: merge a/b -> blah |
8 | 8 |
9 changeset: 3:e16a66a37edd | 9 changeset: 3:13d875a22764 |
10 parent: 2:92cc4c306b19 | 10 parent: 2:7c5dc2e857f2 |
11 parent: 1:96155394af80 | 11 parent: 1:448a8c5e42f1 |
12 user: test | 12 user: test |
13 date: Thu Jan 1 00:00:00 1970 +0000 | 13 date: Mon Jan 12 13:46:40 1970 +0000 |
14 summary: merge b/a -> blah | 14 summary: merge b/a -> blah |
15 | 15 |
16 changeset: 2:92cc4c306b19 | 16 changeset: 2:7c5dc2e857f2 |
17 parent: 0:5e0375449e74 | 17 parent: 0:dc1751ec2e9d |
18 user: test | 18 user: test |
19 date: Thu Jan 1 00:00:00 1970 +0000 | 19 date: Mon Jan 12 13:46:40 1970 +0000 |
20 summary: branch b | 20 summary: branch b |
21 | 21 |
22 changeset: 1:96155394af80 | 22 changeset: 1:448a8c5e42f1 |
23 user: test | 23 user: test |
24 date: Thu Jan 1 00:00:00 1970 +0000 | 24 date: Mon Jan 12 13:46:40 1970 +0000 |
25 summary: branch a | 25 summary: branch a |
26 | 26 |
27 changeset: 0:5e0375449e74 | 27 changeset: 0:dc1751ec2e9d |
28 user: test | 28 user: test |
29 date: Thu Jan 1 00:00:00 1970 +0000 | 29 date: Mon Jan 12 13:46:40 1970 +0000 |
30 summary: test | 30 summary: test |
31 | 31 |
32 rev offset length base linkrev nodeid p1 p2 | 32 rev offset length base linkrev nodeid p1 p2 |
33 0 0 60 0 0 5e0375449e74 000000000000 000000000000 | 33 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 |
34 1 60 62 1 1 96155394af80 5e0375449e74 000000000000 | 34 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 |
35 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000 | 35 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 |
36 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 | 36 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 |
37 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 | 37 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 |
38 | 38 |
39 1 | 39 1 |
40 79d7492df40aa0fa093ec4209be78043c181f094 644 a | 40 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
41 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b | 41 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b |
42 2 | 42 2 |