Mercurial > hg
annotate tests/test-bisect2.out @ 8744:6b675c781c6d
merge: simplify 'other deleted' case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 9369095779a1 |
children | 0491be4448bf |
rev | line source |
---|---|
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
1 % init |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
2 % committing changes |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
4 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
6 (branch merge, don't forget to commit) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
8 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
10 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
12 (branch merge, don't forget to commit) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
13 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
14 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
16 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
17 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
18 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
19 (branch merge, don't forget to commit) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
21 created new head |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
22 % log |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
23 changeset: 18:d42e18c7bc9b |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
24 tag: tip |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
25 parent: 15:857b178a7cf3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
26 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
27 date: Thu Jan 01 00:00:18 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
28 summary: 18 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
29 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
30 changeset: 17:228c06deef46 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
31 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
32 date: Thu Jan 01 00:00:17 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
33 summary: 17 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
34 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
35 changeset: 16:609d82a7ebae |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
36 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
37 date: Thu Jan 01 00:00:16 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
38 summary: 16 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
39 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
40 changeset: 15:857b178a7cf3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
41 parent: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
42 parent: 10:429fcd26f52d |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
43 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
44 date: Thu Jan 01 00:00:15 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
45 summary: merge 10,13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
46 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
47 changeset: 14:faa450606157 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
48 parent: 11:82ca6f06eccd |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
49 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
50 date: Thu Jan 01 00:00:14 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
51 summary: 14 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
52 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
53 changeset: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
54 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
55 date: Thu Jan 01 00:00:13 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
56 summary: 13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
57 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
58 changeset: 12:9f259202bbe7 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
59 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
60 date: Thu Jan 01 00:00:12 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
61 summary: 12 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
62 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
63 changeset: 11:82ca6f06eccd |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
64 parent: 8:dab8161ac8fc |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
65 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
66 date: Thu Jan 01 00:00:11 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
67 summary: 11 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
68 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
69 changeset: 10:429fcd26f52d |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
70 parent: 9:3c77083deb4a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
71 parent: 6:a214d5d3811a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
72 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
73 date: Thu Jan 01 00:00:10 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
74 summary: merge 6,9 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
75 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
76 changeset: 9:3c77083deb4a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
77 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
78 date: Thu Jan 01 00:00:09 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
79 summary: 9 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
80 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
81 changeset: 8:dab8161ac8fc |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
82 parent: 1:4ca5088da217 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
83 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
84 date: Thu Jan 01 00:00:08 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
85 summary: 8 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
86 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
87 changeset: 7:50c76098bbf2 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
88 parent: 4:5c668c22234f |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
89 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
90 date: Thu Jan 01 00:00:07 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
91 summary: 7 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
92 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
93 changeset: 6:a214d5d3811a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
94 parent: 5:385a529b6670 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
95 parent: 4:5c668c22234f |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
96 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
97 date: Thu Jan 01 00:00:06 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
98 summary: merge 4,5 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
99 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
100 changeset: 5:385a529b6670 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
101 parent: 2:051e12f87bf1 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
102 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
103 date: Thu Jan 01 00:00:05 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
104 summary: 5 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
105 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
106 changeset: 4:5c668c22234f |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
107 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
108 date: Thu Jan 01 00:00:04 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
109 summary: 4 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
110 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
111 changeset: 3:0950834f0a9c |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
112 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
113 date: Thu Jan 01 00:00:03 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
114 summary: 3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
115 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
116 changeset: 2:051e12f87bf1 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
117 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
118 date: Thu Jan 01 00:00:02 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
119 summary: 2 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
120 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
121 changeset: 1:4ca5088da217 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
122 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
123 date: Thu Jan 01 00:00:01 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
124 summary: 1 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
125 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
126 changeset: 0:33b1f9bc8bc5 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
127 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
128 date: Thu Jan 01 00:00:00 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
129 summary: 0 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
130 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
131 % hg up -C |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
132 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
133 % complex bisect test 1 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
134 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
135 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
136 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
137 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
138 Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
139 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
140 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
141 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
142 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
143 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
144 The first bad revision is: |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
145 changeset: 9:3c77083deb4a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
146 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
147 date: Thu Jan 01 00:00:09 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
148 summary: 9 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
149 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
150 % complex bisect test 2 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
151 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
152 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
153 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
155 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
156 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
157 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
159 The first good revision is: |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
160 changeset: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
161 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
162 date: Thu Jan 01 00:00:13 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
163 summary: 13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
164 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
165 % complex bisect test 3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
166 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
167 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
168 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
169 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
170 Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
171 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
172 Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
173 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
174 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
175 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
176 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
177 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
178 Due to skipped revisions, the first bad revision could be any of: |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
179 changeset: 9:3c77083deb4a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
180 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
181 date: Thu Jan 01 00:00:09 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
182 summary: 9 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
183 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
184 changeset: 10:429fcd26f52d |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
185 parent: 9:3c77083deb4a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
186 parent: 6:a214d5d3811a |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
187 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
188 date: Thu Jan 01 00:00:10 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
189 summary: merge 6,9 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
190 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
191 changeset: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
192 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
193 date: Thu Jan 01 00:00:13 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
194 summary: 13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
195 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
196 changeset: 15:857b178a7cf3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
197 parent: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
198 parent: 10:429fcd26f52d |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
199 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
200 date: Thu Jan 01 00:00:15 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
201 summary: merge 10,13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
202 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
203 % complex bisect test 4 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
204 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
205 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
206 Testing changeset 13:b0a32c86eb31 (6 changesets remaining, ~2 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
207 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
208 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
209 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
210 Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
212 Due to skipped revisions, the first good revision could be any of: |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
213 changeset: 15:857b178a7cf3 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
214 parent: 13:b0a32c86eb31 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
215 parent: 10:429fcd26f52d |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
216 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
217 date: Thu Jan 01 00:00:15 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
218 summary: merge 10,13 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
219 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
220 changeset: 16:609d82a7ebae |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
221 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
222 date: Thu Jan 01 00:00:16 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
223 summary: 16 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
224 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
225 changeset: 17:228c06deef46 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
226 user: test |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
227 date: Thu Jan 01 00:00:17 1970 +0000 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
228 summary: 17 |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
229 |