Mercurial > hg
comparison tests/test-excessive-merge.out @ 1716:ef8cd889a78b
Refactor excessive merge detection, add test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 17 Feb 2006 17:23:53 -0600 |
parents | |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1715:40346aa66b0f | 1716:ef8cd889a78b |
---|---|
1 changeset: 4:2ee31f665a86 | |
2 tag: tip | |
3 parent: 1:96155394af80 | |
4 parent: 2:92cc4c306b19 | |
5 user: test | |
6 date: Thu Jan 1 00:00:00 1970 +0000 | |
7 summary: merge a/b -> blah | |
8 | |
9 changeset: 3:e16a66a37edd | |
10 parent: 2:92cc4c306b19 | |
11 parent: 1:96155394af80 | |
12 user: test | |
13 date: Thu Jan 1 00:00:00 1970 +0000 | |
14 summary: merge b/a -> blah | |
15 | |
16 changeset: 2:92cc4c306b19 | |
17 parent: 0:5e0375449e74 | |
18 user: test | |
19 date: Thu Jan 1 00:00:00 1970 +0000 | |
20 summary: branch b | |
21 | |
22 changeset: 1:96155394af80 | |
23 user: test | |
24 date: Thu Jan 1 00:00:00 1970 +0000 | |
25 summary: branch a | |
26 | |
27 changeset: 0:5e0375449e74 | |
28 user: test | |
29 date: Thu Jan 1 00:00:00 1970 +0000 | |
30 summary: test | |
31 | |
32 rev offset length base linkrev nodeid p1 p2 | |
33 0 0 60 0 0 5e0375449e74 000000000000 000000000000 | |
34 1 60 62 1 1 96155394af80 5e0375449e74 000000000000 | |
35 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000 | |
36 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 | |
37 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 | |
38 | |
39 1 | |
40 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
41 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b | |
42 2 | |
43 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a | |
44 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
45 3 | |
46 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
47 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
48 4 | |
49 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
50 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
51 | |
52 rev offset length base linkrev nodeid p1 p2 | |
53 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
54 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 | |
55 checking changesets | |
56 checking manifests | |
57 crosschecking files in changesets and manifests | |
58 checking files | |
59 2 files, 5 changesets, 4 total revisions |