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